diff options
| author | Eric Blake <ebb9@byu.net> | 2008-06-04 16:03:13 -0600 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2008-06-05 08:05:45 -0600 |
| commit | 2b2986f1776a2850832d60e699b5231d54aa2d01 (patch) | |
| tree | b357e767a147570c4ec5fef2385ababe7ce04d1b /top/GNUmakefile | |
| parent | b17e7e4ead6ee5982a2c44f26ada09f01df91331 (diff) | |
| download | gnulib-2b2986f1776a2850832d60e699b5231d54aa2d01.tar.gz | |
Be tolerant of UNKNOWN version in gnulib-tool test dir.
* top/GNUmakefile (_dummy): Warn rather than reconfigure if
git-version-gen fails to come up with a version.
Reported by Simon Josefsson.
Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'top/GNUmakefile')
| -rw-r--r-- | top/GNUmakefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/top/GNUmakefile b/top/GNUmakefile index 0c1bc38afb..062900b547 100644 --- a/top/GNUmakefile +++ b/top/GNUmakefile @@ -59,9 +59,13 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) _curr-ver := $(shell cd $(srcdir) && ./$(_build-aux)/git-version-gen \ $(srcdir)/.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 |