diff options
| author | Colin Guthrie <cguthrie@mandriva.org> | 2009-06-28 12:56:57 +0100 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2009-06-29 22:52:31 +0100 |
| commit | 00c392d72c63398145b1c95e46ea0bb44535dd9b (patch) | |
| tree | b7539e65bf45c26960c417776cc416e1e902a776 | |
| parent | 59376b039e10b1ceec5f4955361df2ba001abff3 (diff) | |
bootstrap: Ship git-version-gen with the tarball.
bootstrap.sh is already shipped and when rebootstrapping, it will call git-version-gen
internally when processing configure.ac.
In order to know when someone has rebootstrapped, we modify the tarball version to mark it
as rebootstrapped. Not 100% sure this later stage is desired or if we should remove
the .tarball-version file instead.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | bootstrap.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 4d45a07d..5967f2ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,7 @@ ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo +EXTRA_DIST = bootstrap.sh git-version-gen LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo SUBDIRS = src doxygen man po MAINTAINERCLEANFILES = diff --git a/bootstrap.sh b/bootstrap.sh index d5025db6..aa9755fa 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -46,6 +46,11 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then chmod -c +x .git/hooks/pre-commit fi +if [ -f .tarball-version ]; then + echo "Marking tarball version as modified." + echo -n `cat .tarball-version | sed 's/-rebootstrapped$//'`-rebootstrapped >.tarball-version +fi + # We check for this here, because if pkg-config is not found in the # system, it's likely that the pkg.m4 macro file is also not present, # which will make PKG_PROG_PKG_CONFIG be undefined and the generated |