Use just-built tools, when possible.

* GNUmakefile (PATH): Set and export here, ...
(dummy): ... rather than here.

diff --git a/ChangeLog b/ChangeLog
index 9ba94b5775e6b20d4bd2f85f430d48a49d04fd7a..d6b4ba1e67ff1efc91dad0d8a0dc977ec6a63e88 100644 (file)
--- 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 8dcefc57051a0df5d4cd881f0d1d7c4d57f6d711..79ad49208b88a2f5c95e9cb290bfc4f61d6880ce 100644 (file)
--- 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