Re: Accommodate non-srcdir build-from-checkout.

[Jim Meyering]

Ralf Wildenhues <address@hidden> wrote:

> Hello Jim,
>
> * Jim Meyering wrote on Sun, Nov 11, 2007 at 08:10:53PM CET:
>> This is for you, Ralf :-)
>> I'll push tomorrow.

Hi Ralf,

I've pushed those four from yesterday, plus one more:

        Add more non-srcdir build support.
        * GNUmakefile (dummy): Split a long line.
        Add -v option to autoreconf invocation.

---
 ChangeLog   |    4 ++++
 GNUmakefile |    8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 16ddf6a..6b95b48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-12  Jim Meyering  <address@hidden>

+       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 645d63c..841a918 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
--
1.5.3.5.643.g40e25