Re: Infinite loop on make dist

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Eric Blake on 6/18/2008 10:05 PM:
| According to Stepan Kasal on 6/18/2008 9:50 PM:
| | Hello,
| |   when I unpack autoconf-2.62.tar.lzma and do
| |
| | cd autoconf-2.62
| | mkdir build
| | cd build
| | ../configure && make dist
| |
| | I get into an infinite loop:
| |
| | INFO: running autoreconf for new version string: UNKNOWN
|
| This points to a missing .tarball-version file.  It may also have been
| fixed in gnulib recently, although I haven't yet ported this commit to
| autoconf:
| http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=2b2986f

Oh, I think I see it; it only affects certain VPATH builds where $(srcdir)
is relative.  The rule for _curr-ver does cd $(srcdir) then tries to use
$(srcdir) rather than $(abs_srcdir) or . to access .tarball-version.  I
didn't see it in my VPATH testing, though, because I did 'mkdir ../build
&& cd ../build && ../configure', such that using $(srcdir)==../autoconf
still worked even after the cd.  I'm committing this to gnulib, then I'll
sync to autoconf:

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkhZ4ykACgkQ84KuGfSFAYBSuQCgz5+ByMovzFRrzlgRDFCcqR3y
RDQAn0FDcEFmpakg+f5Piv7wPN3SjFTr
=MlzM
-----END PGP SIGNATURE-----

>From e2d0657fc256e9d193729ed86e08e38da40a7fb7 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Wed, 18 Jun 2008 22:33:37 -0600
Subject: [PATCH] Fix VPATH 'make dist' with GNU make and non-VCS tarball.

* top/GNUmakefile (_curr-ver): Don't use $(srcdir) unnecessarily.
Reported by Stepan Kasal.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog       |    6 ++++++
 top/GNUmakefile |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 696c961..2c94a36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-19  Eric Blake  <address@hidden>
+
+       Fix VPATH 'make dist' with GNU make and non-VCS tarball.
+       * top/GNUmakefile (_curr-ver): Don't use $(srcdir) unnecessarily.
+       Reported by Stepan Kasal.
+
 2008-06-17  Bruno Haible  <address@hidden>
 
        New macro gl_DISABLE_THREADS.
diff --git a/top/GNUmakefile b/top/GNUmakefile
index 062900b..31bd873 100644
--- a/top/GNUmakefile
+++ b/top/GNUmakefile
@@ -56,8 +56,8 @@ 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))
-    _curr-ver := $(shell cd $(srcdir) && ./$(_build-aux)/git-version-gen \
-                   $(srcdir)/.tarball-version)
+    _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)
-- 
1.5.5.1