Re: Generate package.m4 in build-dir, not srcdir.

[Jim Meyering]

Hi Ralf,

This fixes it the "make check" failures for me.
How about for you?

        Avoid spurious test failures due to version skew.
        * GNUmakefile (dummy): Run $(MAKE) clean after autoreconf -i.

Signed-off-by: Jim Meyering <address@hidden>
---
 ChangeLog   |    5 +++++
 GNUmakefile |    4 +++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aaf50a8..f9aacad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-11  Jim Meyering  <address@hidden>
+
+       Avoid spurious test failures due to version skew.
+       * GNUmakefile (dummy): Run $(MAKE) clean after autoreconf -i.
+
 2007-11-10  Jim Meyering  <address@hidden>

        Generate package.m4 in build-dir, not srcdir.
diff --git a/GNUmakefile b/GNUmakefile
index 652d015..cace160 100644
--- 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
--
1.5.3.5.622.g6fd7a