fixup: avoid unconditional re-bootstrapping on "make dist"

Since our 'bootstrap' script is distributed, the 'distdir' target depends
on it.  But in our GNUmakefile, we also have a 'bootstrap' target declared
.PHONY, which when called re-bootstrap the Automake distribution.  Thus,
whenever we run "make dist", GNU make sees it must remake the 'bootstrap'
target (as it is a dependency of the 'distdir' target), and thus ends up
re-bootstrapping all the package (because of the .PHONY 'bootstrap' target
in GNUmakefile).

We fix this issue by renaming our bootstrap script to 'bootstrap.sh'.

* bootstrap: Renamed ...
* bootstrap.sh: ... to this.
* GNUmakefile (bootstrap): Adjust.
* Makefile.am (EXTRA_DIST): Likewise.
(autodiffs): Likewise.
* HACKING: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/GNUmakefile b/GNUmakefile
index dcaaf01a6b17a989364d7ce81e755dd0fc48cda7..06766187d4cdfc91d2af52e79f9988d77810e13c 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -51,7 +51,7 @@ endif
 # Must be phony, not to be confused with the 'bootstrap' script.
 .PHONY: bootstrap
 bootstrap:
-       $(AM_V_BOOTSTRAP)$(am__cd) $(srcdir) && ./bootstrap
+       $(AM_V_BOOTSTRAP)$(am__cd) $(srcdir) && ./bootstrap.sh
        $(AM_V_CONFIGURE)set -e; \
        am__bootstrap_configure () { \
          $(srcdir)/configure $${1+"$$@"} $(BOOTSTRAP_CONFIGURE_FLAGS); \

diff --git a/HACKING b/HACKING
index 70e6f9633a6fb5fdc84a34c97de946979eeb1666..e3153cc01125a69d6a61bc304689b5015f55b681 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -96,7 +96,7 @@
 = Working with git
 
 * To regenerate dependent files created by aclocal and automake,
-  use the 'bootstrap' script.  It uses the code from the source
+  use the 'bootstrap.sh' script.  It uses the code from the source
   tree, so the resulting files (aclocal.m4 and Makefile.in) should
   be the same as you would get if you install this version of
   automake and use it to generate those files.  Be sure to have the
@@ -231,7 +231,7 @@
   distinguish net and repo versions.)
 
 * Run this:
-  ./bootstrap && ./configure && make && make check && make distcheck
+  ./bootstrap.sh && ./configure && make && make check && make distcheck
 
 * Run "make git-tag-release".
   This will run the maintainer checks, check that the NEWS file is
@@ -248,7 +248,7 @@
   use "make GNUPLOADFLAGS='--user KEY' git-upload-release".
 
 * Update version number in configure.ac to next alpha number.
-  Re-run ./bootstrap and commit.
+  Re-run ./bootstrap.sh and commit.
 
 * Don't forget to "git push" your changes so they appear in the public
   git tree.

diff --git a/Makefile.am b/Makefile.am
index 27b3fa022b1c56181c26744bce55d4570bec2163..37b44cf59257e33fc31b6657dbe973ef7615fa46 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,7 +67,7 @@ TAGS_FILES = $(AUTOMAKESOURCES)
 
 EXTRA_DIST += \
   $(AUTOMAKESOURCES) \
-  bootstrap \
+  bootstrap.sh \
   GNUmakefile \
   syntax-checks.mk \
   HACKING
@@ -742,7 +742,7 @@ autodiffs:
               && $(am__cd) tmp \
               && $(GIT) checkout -q "$$rev" \
               && echo "$@: bootstrapping $$rev" \
-              && $(SHELL) ./bootstrap \
+              && $(SHELL) ./bootstrap.sh \
               && echo "$@: copying files from $$rev" \
               && makefile_ins=`find . -name Makefile.in` \
               && (tar cf - configure aclocal.m4 $$makefile_ins) | \

diff --git a/bootstrap b/bootstrap.sh
similarity index 100%
rename from bootstrap
rename to bootstrap.sh