[SCM] GNU Autoconf source repository branch, master, updated. v2.62-49-g46a7a43

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=46a7a4306842f7f23942f36fd595cc7505957cc0

The branch, master has been updated
       via  46a7a4306842f7f23942f36fd595cc7505957cc0 (commit)
      from  36d8106f6dadede2d202cc1a71cb7dbbd7924fc9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 46a7a4306842f7f23942f36fd595cc7505957cc0
Author: Eric Blake <address@hidden>
Date:   Mon Jul 21 15:38:40 2008 -0600

    Resync with gnulib.
    
    * GNUmakefile: Grab from upstream, to fix issue where 'make
    install' would allow installation of stale version string.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |    6 ++++++
 GNUmakefile |   12 +++++++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47c73b7..a45513f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-21  Eric Blake  <address@hidden>
+
+       Resync with gnulib.
+       * GNUmakefile: Grab from upstream, to fix issue where 'make
+       install' would allow installation of stale version string.
+
 2008-07-19  Eric Blake  <address@hidden>
 
        Support multiple arguments to m4_defn, m4_popdef, and m4_undefine.
diff --git a/GNUmakefile b/GNUmakefile
index 31bd873..0f1bba9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -55,12 +55,22 @@ _have-git-version-gen := \
 ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
   _is-dist-target = $(filter-out %clean, \
     $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
-  ifneq (,$(_is-dist-target))
+  _is-install-target = $(filter-out %check, $(filter install%,$(MAKECMDGOALS)))
+  ifneq (,$(_is-dist-target)$(_is-install-target))
     _curr-ver := $(shell cd $(srcdir) \
                    && $(_build-aux)/git-version-gen .tarball-version)
     ifneq ($(_curr-ver),$(VERSION))
       ifeq ($(_curr-ver),UNKNOWN)
         $(info WARNING: unable to verify if $(VERSION) is correct version)
+      else ifneq (,$(_is-install-target))
+        # GNU Coding Standards state that 'make install' should not cause
+        # recompilation after 'make all'.  But as long as changing the version
+        # string alters config.h, the cost of having 'make all' always have an
+        # up-to-date version is prohibitive.  So, as a compromise, we merely
+        # refuse to install if the version string is out of date; the user
+        # must run 'autoreconf' (or something like 'make distcheck') to
+        # fix the version, 'make all' to propagate it, then 'make install'.
+        $(error version string $(VERSION) is out of date; run autoreconf 
before installing)
       else
         $(info INFO: running autoreconf for new version string: $(_curr-ver))
         _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \


hooks/post-receive
--
GNU Autoconf source repository