From a441cb176c057fe68c18121dd651d7a6cee336b9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sat, 27 Oct 2007 21:57:32 +0200
Subject: [PATCH] README-hacking: Recommend running autoreconf -vi.

* GNUmakefile (dummy): Use autoreconf -i, with appropriate PATH,
so that we use just-built tools when they're available.
Suggestions from Ralf Wildenhues.
---
 ChangeLog                 | 7 +++++++
 GNUmakefile               | 6 +++---
 README-hacking            | 4 +---
 build-aux/git-version-gen | 4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 96547a8c..4d8eee97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-28  Jim Meyering  <meyering@redhat.com>
+
+	README-hacking: Recommend running autoreconf -vi.
+	* GNUmakefile (dummy): Use autoreconf -i, with appropriate PATH,
+	so that we use just-built tools when they're available.
+	Suggestions from Ralf Wildenhues.
+
 2007-10-28  Jim Meyering  <meyering@redhat.com>
 
 	Make inter-release --version output more useful.
diff --git a/GNUmakefile b/GNUmakefile
index 30fdcc42..8dcefc57 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -4,7 +4,7 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.
 
-# Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2006-2007 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -47,8 +47,8 @@ ifeq (0,$(MAKELEVEL))
   ifneq (,$(_is-dist-target))
     _curr-ver := $(shell build-aux/git-version-gen .version)
     ifneq ($(_curr-ver),$(VERSION))
-      $(info INFO: rerunning autoconf for new version string: $(_curr-ver))
-      dummy := $(shell rm -rf autom4te.cache; $(AUTOCONF))
+      $(info INFO: running autoreconf for new version string: $(_curr-ver))
+      dummy := $(shell rm -rf autom4te.cache; PATH=`pwd`/tests:$$PATH; autoreconf -i)
     endif
   endif
 endif
diff --git a/README-hacking b/README-hacking
index cbf27545..84bb9f99 100644
--- a/README-hacking
+++ b/README-hacking
@@ -30,9 +30,7 @@ You can get a copy of the source repository like this:
 The next step is to generate files like configure and Makefile.in:
 
 	$ cd autoconf
-	$ aclocal -I m4
-	$ automake
-	$ autoconf
+	$ ( PATH=`pwd`/tests:$PATH; autoreconf -vi )
 
 And there you are!  Just
 
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 812ffb9e..78635f54 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -36,8 +36,6 @@ then
 elif test -d .git \
     && v=`git describe --abbrev=4 HEAD 2>/dev/null` \
     && case $v in
-	 # FIXME: remove this after v6.10.
-	 COREUTILS-[0-9]*) v=`echo "$v" | sed 's/^COREUTILS-//;s/_/./g'` ;;
 	 v[0-9]*) ;;
 	 *) (exit 1) ;;
        esac
@@ -50,7 +48,9 @@ fi
 
 v=`echo "$v" |sed 's/^v//'`
 
+# Don't declare a version "dirty" merely because a time stamp has changed.
 git-status > /dev/null 2>&1
+
 dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
 case "$dirty" in
     '') ;;