Mercurial > gnulib
changeset 10161:5d2f07baed4c
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>
| author | Eric Blake <ebb9@byu.net> |
|---|---|
| date | Wed, 04 Jun 2008 16:03:13 -0600 |
| parents | e9419491977a |
| children | 101fa85f1d56 |
| files | ChangeLog top/GNUmakefile |
| diffstat | 2 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 04 19:32:50 2008 +0200 +++ b/ChangeLog Wed Jun 04 16:03:13 2008 -0600 @@ -1,3 +1,10 @@ +2008-06-05 Eric Blake <ebb9@byu.net> + + 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. + 2008-06-05 Jim Meyering <meyering@redhat.com> Paul Eggert <eggert@cs.ucla.edu>
--- a/top/GNUmakefile Wed Jun 04 19:32:50 2008 +0200 +++ b/top/GNUmakefile Wed Jun 04 16:03:13 2008 -0600 @@ -59,9 +59,13 @@ _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