From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 28 Apr 2012 08:21:31 +0000 (+0200)
Subject: fixup: avoid unconditional re-bootstrapping on "make dist"
X-Git-Tag: v1.12.0b~43
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f810d0d3ae5ea8937566a4f6e62b1dd024253b8;p=platform%2Fupstream%2Fautomake.git

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 dcaaf01..0676618 100644
--- 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 70e6f96..e3153cc 100644
--- 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 27b3fa0..37b44cf 100644
--- 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