diff options
| author | Eric Blake <ebb9@byu.net> | 2008-06-18 23:10:59 -0600 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2008-06-18 23:10:59 -0600 |
| commit | b077f0d2d6ac103f1e9349e7ac41e3dc27774603 (patch) | |
| tree | 44bb272dba8a68f7e2e9b61aff22cf75491dd677 /GNUmakefile | |
| parent | ea2e96c4ac585e6d8457e9f01af6dc53ea1be4aa (diff) | |
| download | autoconf-b077f0d2d6ac103f1e9349e7ac41e3dc27774603.tar.gz | |
Resync with gnulib.
* GNUmakefile: Grab from upstream, to fix VPATH 'make dist' bug.
Reported by Stepan Kasal.
Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile index 0c1bc38a..31bd873f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -56,12 +56,16 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) _is-dist-target = $(filter-out %clean, \ $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS))) ifneq (,$(_is-dist-target)) - _curr-ver := $(shell cd $(srcdir) && ./$(_build-aux)/git-version-gen \ - $(srcdir)/.tarball-version) + _curr-ver := $(shell cd $(srcdir) \ + && $(_build-aux)/git-version-gen .tarball-version) ifneq ($(_curr-ver),$(VERSION)) - $(info INFO: running autoreconf for new version string: $(_curr-ver)) - _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \ - && $(_autoreconf)) + ifeq ($(_curr-ver),UNKNOWN) + $(info WARNING: unable to verify if $(VERSION) is correct version) + else + $(info INFO: running autoreconf for new version string: $(_curr-ver)) + _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \ + && $(_autoreconf)) + endif endif endif endif |