* GNUmakefile: Resynchronize with gnulib.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index ef48fbffb928abab94fa320f1831e39934c83676..4e1cf7447dc3794521031752d1630cd20d83cbc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2008-03-21  Eric Blake  <ebb9@byu.net>
 
+       * GNUmakefile: Resynchronize with gnulib.
+
        Document more uses of $cross_compiling.
        * doc/autoconf.texi (Runtime): Document that a temporary override
        is permissible.

diff --git a/GNUmakefile b/GNUmakefile
index fac11d3d02c61c61b1704a63963ad86fbfc62d09..38dd1262fa18acfa57166a6c2837339146c2504c 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -44,15 +44,19 @@ include Makefile
 -include $(srcdir)/cfg.mk
 include $(srcdir)/maint.mk
 
+# Allow cfg.mk to override these.
+_build-aux ?= build-aux
 _autoreconf ?= autoreconf
 
 # Ensure that $(VERSION) is up to date for dist-related targets, but not
 # for others: rerunning autoreconf and recompiling everything isn't cheap.
-ifeq (0,$(MAKELEVEL))
+_have-git-version-gen := \
+  $(shell test -f $(srcdir)/$(_build-aux)/git-version-gen && echo yes)
+ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
   _is-dist-target = $(filter-out %clean, \
     $(filter dist% alpha beta major,$(MAKECMDGOALS)))
   ifneq (,$(_is-dist-target))
-    _curr-ver := $(shell cd $(srcdir) && ./build-aux/git-version-gen \
+    _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))