Fix version number generation in man pages.

* Makefile.am (EXTRA_DIST): Distribute .version.
(.version): New rule.
* man/Makefile.am (common_dep): Depend on .version, not
configure.ac.
(.x.1): Use package name for version string.
* GNUmakefile [!_have-Makefile]: Sync from upstream, again.
* build-aux/git-version-gen: Sync from upstream.

Signed-off-by: Eric Blake <ebb9@byu.net>

5 files changed, 83 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 6b790881..df454bc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-04-03  Eric Blake  <ebb9@byu.net>
 
+	Fix version number generation in man pages.
+	* Makefile.am (EXTRA_DIST): Distribute .version.
+	(.version): New rule.
+	* man/Makefile.am (common_dep): Depend on .version, not
+	configure.ac.
+	(.x.1): Use package name for version string.
+	* GNUmakefile [!_have-Makefile]: Sync from upstream, again.
+	* build-aux/git-version-gen: Sync from upstream.
+
 	More maintainer tweaks: pass 'make maintainer-distcheck'.
 	* GNUmakefile (_is-dist-target): Sync from upstream.
 	* build-aux/vc-list-files: Sync from upstream, yet again.
diff --git a/GNUmakefile b/GNUmakefile
index 42d7d12b..0c1bc38a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -60,7 +60,8 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
                    $(srcdir)/.tarball-version)
     ifneq ($(_curr-ver),$(VERSION))
       $(info INFO: running autoreconf for new version string: $(_curr-ver))
-      _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache && $(_autoreconf)))
+      _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \
+        && $(_autoreconf))
     endif
   endif
 endif
@@ -68,11 +69,16 @@ endif
 else
 
 .DEFAULT_GOAL := abort-due-to-no-makefile
+srcdir = .
 
 # The package can override .DEFAULT_GOAL to run actions like autoreconf.
 -include ./cfg.mk
 include ./maint.mk
 
+ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile)
+$(MAKECMDGOALS): abort-due-to-no-makefile
+endif
+
 abort-due-to-no-makefile:
 	@echo There seems to be no Makefile in this directory.   1>&2
 	@echo "You must run ./configure before running \`make'." 1>&2
diff --git a/Makefile.am b/Makefile.am
index 86b64910..5a9f5f73 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
 	     BUGS \
 	     GNUmakefile maint.mk cfg.mk \
 	     build-aux/git-version-gen \
-	     build-aux/announce-gen .prev-version
+	     build-aux/announce-gen .prev-version .version
 
 MAINTAINERCLEANFILES = $(srcdir)/INSTALL
 
@@ -88,6 +88,24 @@ autom4te-update:
 	  $(move_if_change) Fetchdir/$$file $(srcdir)/lib/$$file || exit; \
 	done
 
+# Version string management.  There are two files to be aware of:
+# .tarball-version - present only in a distribution tarball, and not in
+#   a checked-out repository.  Created with contents that were learned at
+#   the last time autoconf was run, and used by git-version-gen.  Must not
+#   be present in either $(srcdir) or $(builddir) for git-version-gen to
+#   give accurate answers during normal development with a checked out tree,
+#   but must be present in a tarball when there is no version control system.
+#   Therefore, it cannot be used in any dependencies.  GNUmakefile has
+#   hooks to force a reconfigure at distribution time to get the value
+#   correct, without penalizing normal development with extra reconfigures.
+# .version - present in a checked-out repository and in a distribution
+#   tarball.  At least as current as the most recent .tarball-version
+#   creation.  Usable in dependencies, particularly for files that don't
+#   want to depend on config.h but do want to track version changes.
+BUILT_SOURCES = $(top_srcdir)/.version
+$(top_srcdir)/.version:
+	echo $(VERSION) > $@-t && mv $@-t $@
+
 # Arrange so that .tarball-version appears only in distribution tarballs,
 # never in a checked-out repository.
 dist-hook:
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 5f819ba7..7aa02536 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,8 +1,8 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2008-03-02.16
+scriptversion=2008-04-03.22
 
-# Copyright (C) 2007 Free Software Foundation
+# Copyright (C) 2007-2008 Free Software Foundation
 #
 # 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
@@ -26,6 +26,48 @@ scriptversion=2008-03-02.16
 # - from a non-git-repo directory containing a .tarball-version file, which
 #   presumes this script is invoked like "./git-version-gen .tarball-version".
 
+# In order to use intra-version strings in your project, you will need two
+# separate generated version string files:
+#
+# .tarball-version - present only in a distribution tarball, and not in
+#   a checked-out repository.  Created with contents that were learned at
+#   the last time autoconf was run, and used by git-version-gen.  Must not
+#   be present in either $(srcdir) or $(builddir) for git-version-gen to
+#   give accurate answers during normal development with a checked out tree,
+#   but must be present in a tarball when there is no version control system.
+#   Therefore, it cannot be used in any dependencies.  GNUmakefile has
+#   hooks to force a reconfigure at distribution time to get the value
+#   correct, without penalizing normal development with extra reconfigures.
+#
+# .version - present in a checked-out repository and in a distribution
+#   tarball.  Usable in dependencies, particularly for files that don't
+#   want to depend on config.h but do want to track version changes.
+#   Delete this file prior to any autoconf run where you want to rebuild
+#   files to pick up a version string change; and leave it stale to
+#   minimize rebuild time after unrelated changes to configure sources.
+#
+# It is probably wise to add these two files to .gitignore, so that you
+# don't accidentally commit either generated file.
+#
+# Use the following line in your configure.ac, so that $(VERSION) will
+# automatically be up-to-date each time configure is run (and note that
+# since configure.ac no longer includes a version string, Makefile rules
+# should not depend on configure.ac for version updates).
+#
+# AC_INIT([GNU project],
+#         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+#         [bug-project@example])
+#
+# Then use the following lines in your Makefile.am, so that .version
+# will be present for dependencies, and so that .tarball-version will
+# exist in distribution tarballs.
+#
+# BUILT_SOURCES = $(top_srcdir)/.version
+# $(top_srcdir)/.version:
+#	echo $(VERSION) > $@-t && mv $@-t $@
+# dist-hook:
+#	echo $(VERSION) > $(distdir)/.tarball-version
+
 case $# in
     1) ;;
     *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;;
diff --git a/man/Makefile.am b/man/Makefile.am
index 9485d28d..119c91d7 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,6 @@
 # Make Autoconf man pages.
 
-# Copyright (C) 2001, 2004-2007 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2004-2008 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
@@ -29,8 +29,8 @@ dist_man_MANS = \
 EXTRA_DIST = $(dist_man_MANS:.1=.x) common.x
 MAINTAINERCLEANFILES = $(dist_man_MANS)
 
-# Depend on configure.ac to get version number changes.
-common_dep = $(top_srcdir)/configure.ac $(srcdir)/common.x
+# Depend on .version to get version number changes.
+common_dep = $(top_srcdir)/.version $(srcdir)/common.x
 binsrcdir = $(top_srcdir)/bin
 $(srcdir)/autoconf.1:   $(common_dep) $(binsrcdir)/autoconf.as
 $(srcdir)/autoheader.1: $(common_dep) $(binsrcdir)/autoheader.in
@@ -57,6 +57,7 @@ SUFFIXES = .x .1
 	$(HELP2MAN) \
 	    --include=$*.x \
 	    --include=$(srcdir)/common.x \
+	    --source='$(PACKAGE_STRING)' \
 	    --output=$@.t `echo '$*' | sed 's,.*/,,'`
 	if sed $(remove_time_stamp) $@ >$@a.t 2>/dev/null && \
 	   sed $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \