# HG changeset patch
# User Eric Blake <ebb9@byu.net>
# Date 1213850017 21600
# Node ID 8c1fb8a7e62da1b8a30c5d0590ccd01204114a36
# Parent  8c0d36d59e97a9154296f46eb76bdd402e555816
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 <ebb9@byu.net>

diff -r 8c0d36d59e97 -r 8c1fb8a7e62d ChangeLog
--- a/ChangeLog	Thu Jun 19 03:34:29 2008 +0200
+++ b/ChangeLog	Wed Jun 18 22:33:37 2008 -0600
@@ -1,3 +1,9 @@
+2008-06-19  Eric Blake  <ebb9@byu.net>
+
+	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-18  Bruno Haible  <bruno@clisp.org>
 
 	* lib/fatal-signal.c (init_fatal_signals): Add comment.
diff -r 8c0d36d59e97 -r 8c1fb8a7e62d top/GNUmakefile
--- a/top/GNUmakefile	Thu Jun 19 03:34:29 2008 +0200
+++ b/top/GNUmakefile	Wed Jun 18 22:33:37 2008 -0600
@@ -56,8 +56,8 @@
   _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)