diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-28 10:21:31 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-28 10:38:07 +0200 |
commit | 5f810d0d3ae5ea8937566a4f6e62b1dd024253b8 (patch) | |
tree | 873dff779931d251c8818abfb574de40e11bfd88 /GNUmakefile | |
parent | 8ea72c74515c921196abcc99dbbcd9db8bd1c060 (diff) | |
download | automake-5f810d0d3ae5ea8937566a4f6e62b1dd024253b8.tar.gz |
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>
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index dcaaf01a6..06766187d 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); \ |