Avoid spurious test failures due to version skew.

* GNUmakefile (dummy): Run $(MAKE) clean after autoreconf -i.

diff --git a/ChangeLog b/ChangeLog
index 942205674f293a4566dc36534adb89937111bd02..e590dc40600bc0b22a43dacaa0e0f7f93b331bf4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-12  Jim Meyering  <meyering@redhat.com>
+
+       Avoid spurious test failures due to version skew.
+       * GNUmakefile (dummy): Run $(MAKE) clean after autoreconf -i.
+
 2007-11-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Avoid warnings about conftest.dSYM directories on Mac OS X Leopard.

diff --git a/GNUmakefile b/GNUmakefile
index 652d0156bd480172755f748bfd879286d51ebe2a..cace1601b2aa13231ce780a8be3ca2c67ebfcdcb 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -45,13 +45,15 @@ include Makefile
 
 # Ensure that $(VERSION) is up to date for dist-related targets, but not
 # for others: rerunning autoconf and recompiling everything isn't cheap.
+# The $(MAKE) clean is required, to remove all traces of the previous
+# version string, which would otherwise cause a few test failures.
 ifeq (0,$(MAKELEVEL))
   _is-dist-target = $(filter dist% alpha beta major,$(MAKECMDGOALS))
   ifneq (,$(_is-dist-target))
     _curr-ver := $(shell build-aux/git-version-gen .version)
     ifneq ($(_curr-ver),$(VERSION))
       $(info INFO: running autoreconf for new version string: $(_curr-ver))
-      dummy := $(shell rm -rf autom4te.cache; autoreconf -i)
+      dummy := $(shell rm -rf autom4te.cache; autoreconf -i && $(MAKE) clean)
     endif
   endif
 endif