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 16ddf6a60a5cdca9c116766ade1ada8d6c85eca5..6b95b48a0880cc4c0f899c5d14375a8529ac6e94 100644 (file)
--- 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 645d63c19d26f50205630c3a327365091bbee7fd..841a9180f1df6bff14471df17157f90d046bade2 100644 (file)
--- 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