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

[Eric Blake]

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=f752252f504a1487c16322b23a6ae0084ebb4b46

The branch, master has been updated
       via  f752252f504a1487c16322b23a6ae0084ebb4b46 (commit)
      from  491715eda76c5dcfc9785c05d638e72f7ce2d087 (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 f752252f504a1487c16322b23a6ae0084ebb4b46
Author: Eric Blake <address@hidden>
Date:   Thu Apr 3 11:02:50 2008 -0600

    More maintainer tweaks: pass 'make maintainer-distcheck'.
    
    * GNUmakefile (_is-dist-target): Sync from upstream.
    * build-aux/vc-list-files: Sync from upstream, yet again.
    * tests/atlocal.in (unsupported_fs_chars): Always remove tdir.
    * tests/Makefile.am (EXTRA_DIST): Don't distribute the built
    package.m4.
    * lib/autoconf/general.m4 (_AC_INIT_COPYRIGHT): Bump year.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog               |    8 ++++++++
 GNUmakefile             |    2 +-
 build-aux/vc-list-files |    4 ++--
 lib/autoconf/general.m4 |    2 +-
 tests/Makefile.am       |    8 +++++---
 tests/atlocal.in        |    2 +-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 76fa890..6b79088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-04-03  Eric Blake  <address@hidden>
 
+       More maintainer tweaks: pass 'make maintainer-distcheck'.
+       * GNUmakefile (_is-dist-target): Sync from upstream.
+       * build-aux/vc-list-files: Sync from upstream, yet again.
+       * tests/atlocal.in (unsupported_fs_chars): Always remove tdir.
+       * tests/Makefile.am (EXTRA_DIST): Don't distribute the built
+       package.m4.
+       * lib/autoconf/general.m4 (_AC_INIT_COPYRIGHT): Bump year.
+
        Fix VPATH 'make syntax-check'.
        * maint.mk (VC_LIST, VC_LIST_EXCEPT, sc_changelog)
        (sc_prohibit_jm_in_m4, makefile-check): Support VPATH.
diff --git a/GNUmakefile b/GNUmakefile
index 38dd126..42d7d12 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -54,7 +54,7 @@ _have-git-version-gen := \
   $(shell test -f $(srcdir)/$(_build-aux)/git-version-gen && echo yes)
 ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
   _is-dist-target = $(filter-out %clean, \
-    $(filter dist% alpha beta major,$(MAKECMDGOALS)))
+    $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
   ifneq (,$(_is-dist-target))
     _curr-ver := $(shell cd $(srcdir) && ./$(_build-aux)/git-version-gen \
                    $(srcdir)/.tarball-version)
diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files
index 35046d5..762d7ee 100755
--- a/build-aux/vc-list-files
+++ b/build-aux/vc-list-files
@@ -2,7 +2,7 @@
 # List version-controlled file names.
 
 # Print a version string.
-scriptversion=2008-04-03.14
+scriptversion=2008-04-03.17
 
 # Copyright (C) 2006-2008 Free Software Foundation, Inc.
 
@@ -56,7 +56,7 @@ EOF
     exit ;;
 
   -C)
-    postprocess="| sed 's|^|$2/|'"
+    test "$2" = . || postprocess="| sed 's|^|$2/|'"
     cd "$2" || exit 1
     shift; shift ;;
 esac
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 058e193..1807f5c 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -342,7 +342,7 @@ m4_ifset([AC_PACKAGE_BUGREPORT],
 m4_define([_AC_INIT_COPYRIGHT],
 [AC_COPYRIGHT(
 [Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.],
              [VERSION_FSF])dnl
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ac89c62..1613f02 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,10 +16,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# We don't actually distribute the testsuite, since one only
-# needs m4 to build it, m4 being required anyway to install Autoconf.
+# We don't actually distribute the built testsuite or package.m4, since one
+# only needs m4 to build them, and m4 is required to install Autoconf.
+# But if you are borrowing from this file for setting up autotest in your
+# project, remember to distribute both testsuite and package.m4.
 EXTRA_DIST = $(TESTSUITE_AT) local.at mktests.sh \
-            atlocal.in package.m4 wrapper.as
+            atlocal.in wrapper.as
 
 # Running the uninstalled scripts.  Build them upon `all', for the manpages.
 noinst_SCRIPTS = $(wrappers)
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 5e87410..a295e1b 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -46,7 +46,7 @@ rm -rf 'tdir /'
 mkdir 'tdir ' && touch 'tdir /tfile' 2>/dev/null
 if test -f 'tdir /tfile'; then
   func_sanitize_dir_name () { echo "$@"; }
-  rm -rf 'tdir /'
 else
   func_sanitize_dir_name () { echo "$@" | sed 's/  *$//'; }
 fi
+rm -rf 'tdir /'


hooks/post-receive
--
GNU Autoconf source repository