summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--GNUmakefile5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ba94b57..d6b4ba1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-03 Jim Meyering <meyering@redhat.com>
+
+ Use just-built tools, when possible.
+ * GNUmakefile (PATH): Set and export here, ...
+ (dummy): ... rather than here.
+
2007-11-03 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
and Andreas Schwab <schwab@suse.de>
diff --git a/GNUmakefile b/GNUmakefile
index 8dcefc57..79ad4920 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -38,6 +38,9 @@ ifeq ($(have-Makefile),yes)
# Make tar archive easier to reproduce.
export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
+# Build with our own versions of these tools, when possible.
+export PATH = '$(shell echo "`pwd`/tests:$$PATH")'
+
include Makefile
# Ensure that $(VERSION) is up to date for dist-related targets, but not
@@ -48,7 +51,7 @@ ifeq (0,$(MAKELEVEL))
_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; PATH=`pwd`/tests:$$PATH; autoreconf -i)
+ dummy := $(shell rm -rf autom4te.cache; autoreconf -i)
endif
endif
endif