From 703fbf369a521caa492df0ce38db36691ba358b8 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 11 Nov 2007 18:08:53 +0100 Subject: [PATCH] Avoid spurious test failures due to version skew. * GNUmakefile (dummy): Run $(MAKE) clean after autoreconf -i. --- ChangeLog | 5 +++++ GNUmakefile | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 94220567..e590dc40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-11-12 Jim Meyering + + Avoid spurious test failures due to version skew. + * GNUmakefile (dummy): Run $(MAKE) clean after autoreconf -i. + 2007-11-12 Ralf Wildenhues Avoid warnings about conftest.dSYM directories on Mac OS X Leopard. diff --git a/GNUmakefile b/GNUmakefile index 652d0156..cace1601 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 -- 2.47.2