Run autoconf manually, if needed to get an updated version string.

* GNUmakefile: Don't actually touch configure.ac.
That would make git-version-gen always print "...-dirty".

diff --git a/ChangeLog b/ChangeLog
index c64c68fd53d4caecce7fe2401ef8640d4b345a91..cf1cffcde94972edd3f022d00441febbcce8e0f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-09-03  Jim Meyering  <jim@meyering.net>
 
+       Invoke $(AUTOCONF) manually, if needed to get an updated version string.
+       * GNUmakefile: Don't actually touch configure.ac.
+       That would make git-version-gen always print "...-dirty".
+
        Don't change '-'s to '.'s in the string from git-describe.
        * build-aux/git-version-gen: Leave '-'s in the string from git-describe.
        Otherwise, s/-/./g would make it too hard to distinguish the base

diff --git a/GNUmakefile b/GNUmakefile
index 92f989c2bd2ac3f51d690156508c7e997910d97c..c5678b43d02adea5b5e9b4546ad8b4ae5a2f7743 100644 (file)
--- 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 0 .version)
     ifneq ($(_curr-ver),$(VERSION))
-      $(info INFO: rerunning autoconf for new version string $(_curr-ver))
-      $(shell touch configure.ac)
+      $(info INFO: rerunning autoconf for new version string: $(_curr-ver))
+      dummy := $(shell rm -rf autom4te.cache; $(AUTOCONF))
     endif
   endif
 endif