[SCM] GNU Autoconf source repository branch, master, updated. v2.61a-385-ge30dffd

[Jim Meyering]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=e30dffd71447fb41189390cabbabcf8e7e962549

The branch, master has been updated
       via  e30dffd71447fb41189390cabbabcf8e7e962549 (commit)
      from  3c108e5e9d4eeff6faebc3107dfd11e3b238227e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e30dffd71447fb41189390cabbabcf8e7e962549
Author: Jim Meyering <address@hidden>
Date:   Wed Mar 12 13:14:44 2008 +0100

    Use a more general GNUmakefile.
    
    * GNUmakefile: Sync from coreutils.
    * Makefile.am (EXTRA_DIST): Add GNUmakefile.cfg.
    * GNUmakefile.cfg: New file.

-----------------------------------------------------------------------

Summary of changes:
 GNUmakefile     |   17 +++++++----------
 GNUmakefile.cfg |    7 +++++++
 Makefile.am     |    3 ++-
 3 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 GNUmakefile.cfg

diff --git a/GNUmakefile b/GNUmakefile
index e22015b..8bbd6c8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -38,14 +38,15 @@ ifeq ($(_have-Makefile),yes)
 # Make tar archive easier to reproduce.
 export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
 
-# Build with our own versions of these tools, when possible.
-export PATH = $(shell echo "`pwd`/tests:$$PATH")
-
 include Makefile
 
+# Some projects override e.g., _autoreconf here.
+-include $(srcdir)/GNUmakefile.cfg
+
+_autoreconf ?= autoreconf
+
 # Ensure that $(VERSION) is up to date for dist-related targets, but not
-# for others: rerunning autoconf and recompiling everything isn't cheap.
-# Remove the autoreconf-provided INSTALL, so that we regenerate it.
+# for others: rerunning autoreconf and recompiling everything isn't cheap.
 ifeq (0,$(MAKELEVEL))
   _is-dist-target = $(filter-out %clean, \
     $(filter dist% alpha beta major,$(MAKECMDGOALS)))
@@ -54,11 +55,7 @@ ifeq (0,$(MAKELEVEL))
                    $(srcdir)/.tarball-version)
     ifneq ($(_curr-ver),$(VERSION))
       $(info INFO: running autoreconf for new version string: $(_curr-ver))
-      _dummy := $(shell                                \
-       cd $(srcdir)                            \
-         && rm -rf autom4te.cache              \
-         && autoreconf -i -v                   \
-         && rm -f INSTALL)
+      _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache && 
$(_autoreconf)))
     endif
   endif
 endif
diff --git a/GNUmakefile.cfg b/GNUmakefile.cfg
new file mode 100644
index 0000000..be213f4
--- /dev/null
+++ b/GNUmakefile.cfg
@@ -0,0 +1,7 @@
+# This file is '-include'd into GNUmakefile.
+
+# Build with our own versions of these tools, when possible.
+export PATH = $(shell echo "`pwd`/tests:$$PATH")
+
+# Remove the autoreconf-provided INSTALL, so that we regenerate it.
+_autoreconf = autoreconf -i -v && rm -f INSTALL
diff --git a/Makefile.am b/Makefile.am
index 57e7509..9abb7ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,8 @@ ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
             BUGS \
-            GNUmakefile Makefile.maint Makefile.cfg \
+            GNUmakefile GNUmakefile.cfg \
+            Makefile.maint Makefile.cfg \
             build-aux/git-version-gen \
             config/announce-gen config/prev-version.txt
 


hooks/post-receive
--
GNU Autoconf source repository