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>

diff --git a/ChangeLog b/ChangeLog
index 6a2fe71eaa8d713cbd78a491edc0eb3697161d86..75cde7b2beea5f55c6234329d76a04483a57fec3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-19  Eric Blake  <ebb9@byu.net>
+
+       Resync with gnulib.
+       * GNUmakefile: Grab from upstream, to fix VPATH 'make dist' bug.
+       Reported by Stepan Kasal.
+
 2008-06-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Reorganize autotest files, factorize for parallel execution.

diff --git a/GNUmakefile b/GNUmakefile
index 0c1bc38afbd122b7b2618f1a6b03317d05f2e395..31bd873fadeca303c97f6b3aba39e9ed0eabc500 100644 (file)
--- 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