From 2b2986f1776a2850832d60e699b5231d54aa2d01 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 4 Jun 2008 16:03:13 -0600 Subject: [PATCH] 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 --- ChangeLog | 7 +++++++ top/GNUmakefile | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3f7d4131..f30e73370 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-05 Eric Blake + + 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 Paul Eggert diff --git a/top/GNUmakefile b/top/GNUmakefile index 0c1bc38af..062900b54 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 -- 2.11.0