[PATCH] Don't infloop upon "make dist".

[Jim Meyering]

I noticed that "make dist" would infloop.
This change fixes that and syncs the pieces
from coreutils and gnulib:

        Don't infloop upon "make dist".
        * GNUmakefile: Merge from coreutils.
        * Makefile.am (dist-hook): Inject .tarball-version into tarball,
        not .version.
        * configure.ac (AC_INIT): Use .tarball-version, not .version.
        * build-aux/git-version-gen: Update from gnulib.

Ok to commit?

Signed-off-by: Jim Meyering <address@hidden>
---
 ChangeLog                 |    8 ++++++++
 GNUmakefile               |   17 +++++++++--------
 Makefile.am               |    4 ++--
 build-aux/git-version-gen |    6 +++---
 configure.ac              |    3 ++-
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 199d5fa..879824a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-02  Jim Meyering  <address@hidden>
+
+       Don't infloop upon "make dist".
+       * GNUmakefile: Merge from coreutils.
+       * Makefile.am (dist-hook): Inject .tarball-version into tarball,
+       not .version.
+       * configure.ac (AC_INIT): Use .tarball-version, not .version.
+
 2008-03-02  Ralf Wildenhues  <address@hidden>

        * tests/torture.at (AC_CONFIG_FILES, HEADERS, LINKS and COMMANDS):
diff --git a/GNUmakefile b/GNUmakefile
index eca7b16..a900d25 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -4,18 +4,18 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.

-# Copyright (C) 2001, 2003, 2006-2007 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2006-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
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-#
+
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
+
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

@@ -29,11 +29,11 @@ else
 SHELL = sh
 endif

-have-Makefile := $(shell test -f Makefile && echo yes)
+_have-Makefile := $(shell test -f Makefile && echo yes)

 # If the user runs GNU make but has not yet run ./configure,
 # give them a diagnostic.
-ifeq ($(have-Makefile),yes)
+ifeq ($(_have-Makefile),yes)

 # Make tar archive easier to reproduce.
 export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
@@ -49,10 +49,11 @@ include Makefile
 ifeq (0,$(MAKELEVEL))
   _is-dist-target = $(filter dist% alpha beta major,$(MAKECMDGOALS))
   ifneq (,$(_is-dist-target))
-    _curr-ver := $(shell $(srcdir)/build-aux/git-version-gen $(srcdir) 
.version)
+    _curr-ver := $(shell $(srcdir)/build-aux/git-version-gen \
+                   $(srcdir)/.tarball-version)
     ifneq ($(_curr-ver),$(VERSION))
-      $(info INFO: running autoreconf for new version string; old: 
$(_curr-ver))
-      dummy := $(shell                         \
+      $(info INFO: running autoreconf for new version string: $(_curr-ver))
+      _dummy := $(shell                                \
        rm -rf autom4te.cache;                  \
        (cd $(srcdir) && autoreconf -i -v)      \
          && rm -f INSTALL)
diff --git a/Makefile.am b/Makefile.am
index 6a111f2..fb08651 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,7 +88,7 @@ autom4te-update:
          $(move_if_change) Fetchdir/$$file $(srcdir)/lib/$$file || exit; \
        done

-# Arrange so that .version appears only in distribution tarballs,
+# Arrange so that .tarball-version appears only in distribution tarballs,
 # never in a checked-out repository.
 dist-hook:
-       echo $(VERSION) > $(distdir)/.version
+       echo $(VERSION) > $(distdir)/.tarball-version
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 1a00107..5f819ba 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2008-02-08.11
+scriptversion=2008-03-02.16

 # Copyright (C) 2007 Free Software Foundation
 #
@@ -23,12 +23,12 @@ scriptversion=2008-02-08.11
 # It may be run two ways:
 # - from a git repository in which the "git describe" command below
 #   produces useful output (thus requiring at least one signed tag)
-# - from a non-git-repo directory containing a .version file, which
+# - from a non-git-repo directory containing a .tarball-version file, which
 #   presumes this script is invoked like "./git-version-gen .tarball-version".

 case $# in
     1) ;;
-    *) echo 1>&2 "Usage: $0 \$srcdir/.version"; exit 1;;
+    *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;;
 esac

 tarball_version_file=$1
diff --git a/configure.ac b/configure.ac
index caff001..99ba100 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,8 @@
 # We need AC_CONFIG_TESTDIR, AC_PROG_SED, AC_PROG_GREP.
 AC_PREREQ([2.60])

-AC_INIT([GNU Autoconf], m4_esyscmd([build-aux/git-version-gen .version]),
+AC_INIT([GNU Autoconf],
+       m4_esyscmd([build-aux/git-version-gen .tarball-version]),
        address@hidden)
 AC_SUBST([PACKAGE_NAME])dnl
 AC_CONFIG_SRCDIR([ChangeLog])
--
1.5.4.3.231.g258d9