diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-05-29 23:58:12 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-05-29 23:58:12 +0200 |
| commit | a927b6c1d885162c8c3068a74c07840c5bb52162 (patch) | |
| tree | 37b08eaeeb45e1023e0aeb0726bf30ef67b233fb /GNUmakefile | |
| parent | 9c17af407008aae5812d8c3e058c54d04a59c8d6 (diff) | |
Update Gnulib to v0.0-3955-g8ab5996.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile index 40ccc061d..97fea3653 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 |