From b077f0d2d6ac103f1e9349e7ac41e3dc27774603 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 18 Jun 2008 23:10:59 -0600 Subject: [PATCH] Resync with gnulib. * GNUmakefile: Grab from upstream, to fix VPATH 'make dist' bug. Reported by Stepan Kasal. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ GNUmakefile | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a2fe71e..75cde7b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-19 Eric Blake + + Resync with gnulib. + * GNUmakefile: Grab from upstream, to fix VPATH 'make dist' bug. + Reported by Stepan Kasal. + 2008-06-18 Ralf Wildenhues Reorganize autotest files, factorize for parallel execution. 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 -- 2.47.2