Re: upstream file sync

[Eric Blake]

Eric Blake <ebb9 <at> byu.net> writes:

> > And another round of syncs, this time so that a VPATH 'make syntax-check' 
> also 
> > passes.
> 

Next round.  This time, so that the man pages have a consistent version string 
in them.

>From 1fda5799d3763286e53673bb1a0174c6c3518a6c Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Thu, 3 Apr 2008 16:45:11 -0600
Subject: [PATCH] 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 <address@hidden>
---
 ChangeLog                 |    9 ++++++++
 GNUmakefile               |    8 ++++++-
 Makefile.am               |   20 ++++++++++++++++++-
 build-aux/git-version-gen |   46 +++++++++++++++++++++++++++++++++++++++++++-
 man/Makefile.am           |    7 +++--
 5 files changed, 83 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b79088..df454bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-04-03  Eric Blake  <address@hidden>
 
+       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 42d7d12..0c1bc38 100644
diff --git a/Makefile.am b/Makefile.am
index 86b6491..5a9f5f7 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) > address@hidden && mv address@hidden $@
+
 # 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 5f819ba..7aa0253 100755
diff --git a/man/Makefile.am b/man/Makefile.am
index 9485d28..119c91d 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)' \
            address@hidden `echo '$*' | sed 's,.*/,,'`
        if sed $(remove_time_stamp) $@ >address@hidden 2>/dev/null && \
           sed $(remove_time_stamp) address@hidden | cmp address@hidden - 
>/dev/null 2>&1; then \
-- 
1.5.4