diff options
| author | Eric Blake <eblake@redhat.com> | 2010-07-02 15:58:07 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2010-07-02 15:58:07 -0600 |
| commit | cee5094186e07936c93b4c6b6890d14a97c0a9bd (patch) | |
| tree | fa8cba59911d4a6bfe27ee2d0499c3931a5f33b8 /GNUmakefile | |
| parent | ab90874a9a64ade3b99e3baeee9802330ff212d4 (diff) | |
| download | autoconf-cee5094186e07936c93b4c6b6890d14a97c0a9bd.tar.gz | |
Resync upstream files.
* GNUmakefile: Run 'make fetch'.
* build-aux/announce-gen: Likewise.
* build-aux/config.guess: Likewise.
* build-aux/config.sub: Likewise.
* build-aux/gendocs.sh: Likewise.
* build-aux/git-version-gen: Likewise.
* build-aux/gnupload: Likewise.
* build-aux/texinfo.tex: Likewise.
* build-aux/vc-list-files: Likewise.
* doc/gendocs_template: Likewise.
* doc/gnu-oids.texi: Likewise.
* doc/make-stds.texi: Likewise.
* doc/standards.texi: Likewise.
* lib/Autom4te/Channels.pm: Likewise.
* lib/Autom4te/Configure_ac.pm: Likewise.
* lib/Autom4te/FileUtils.pm: Likewise.
* lib/Autom4te/XFile.pm: Likewise.
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile index 40ccc061..97fea365 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -49,7 +49,7 @@ include $(srcdir)/maint.mk # Allow cfg.mk to override these. _build-aux ?= build-aux -_autoreconf ?= autoreconf +_autoreconf ?= autoreconf -v # Ensure that $(VERSION) is up to date for dist-related targets, but not # for others: rerunning autoreconf and recompiling everything isn't cheap. @@ -60,8 +60,10 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS))) _is-install-target ?= $(filter-out %check, $(filter install%,$(MAKECMDGOALS))) ifneq (,$(_is-dist-target)$(_is-install-target)) - _curr-ver := $(shell cd $(srcdir) \ - && $(_build-aux)/git-version-gen .tarball-version) + _curr-ver := $(shell cd $(srcdir) \ + && $(_build-aux)/git-version-gen \ + .tarball-version \ + $(git-version-gen-tag-sed-script)) ifneq ($(_curr-ver),$(VERSION)) ifeq ($(_curr-ver),UNKNOWN) $(info WARNING: unable to verify if $(VERSION) is the correct version) @@ -78,7 +80,8 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) $(info run '$(MAKE) _version' to fix it) else $(info INFO: running autoreconf for new version string: $(_curr-ver)) - _dummy := $(shell $(MAKE) $(AM_MAKEFLAGS) _version) +GNUmakefile: _version + touch GNUmakefile endif endif endif @@ -88,6 +91,7 @@ endif .PHONY: _version _version: cd $(srcdir) && rm -rf autom4te.cache .version && $(_autoreconf) + $(MAKE) $(AM_MAKEFLAGS) Makefile else |