From: Jim Meyering <meyering@redhat.com>
Date: Mon, 12 Nov 2007 19:09:13 +0000 (+0100)
Subject: Add more non-srcdir build support.
X-Git-Tag: v2.62~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7daa47a115af00621ccbf202e61d87e69e5e48b9;p=thirdparty%2Fautoconf.git

Add more non-srcdir build support.

* GNUmakefile (dummy): Split a long line.
Add -v option to autoreconf invocation.
---

diff --git a/ChangeLog b/ChangeLog
index 16ddf6a6..6b95b48a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-12  Jim Meyering  <meyering@redhat.com>
 
+	Add more non-srcdir build support.
+	* GNUmakefile (dummy): Split a long line.
+	Add -v option to autoreconf invocation.
+
 	Remove the autoreconf-provided INSTALL, so that we regenerate it.
 	* GNUmakefile (dummy): Remove INSTALL.
 
diff --git a/GNUmakefile b/GNUmakefile
index 645d63c1..841a9180 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -51,10 +51,14 @@ include Makefile
 ifeq (0,$(MAKELEVEL))
   _is-dist-target = $(filter dist% alpha beta major,$(MAKECMDGOALS))
   ifneq (,$(_is-dist-target))
-    _curr-ver := $(shell build-aux/git-version-gen $(srcdir) .version)
+    _curr-ver := $(shell $(srcdir)/build-aux/git-version-gen $(srcdir) .version)
     ifneq ($(_curr-ver),$(VERSION))
       $(info INFO: running autoreconf for new version string; old: $(_curr-ver))
-      dummy := $(shell rm -rf autom4te.cache; autoreconf -i -v && $(MAKE) clean && rm -f INSTALL)
+      dummy := $(shell				\
+	rm -rf autom4te.cache;			\
+	(cd $(srcdir) && autoreconf -i -v)	\
+	  && $(MAKE) clean			\
+	  && rm -f INSTALL)
     endif
   endif
 endif