Re: upstream file sync

[Eric Blake]

Eric Blake <ebb9 <at> byu.net> writes:

> And another round of syncs, this time so that a VPATH 'make syntax-check' 
also 
> passes.

More updates, so that in-place 'make maintainer-distcheck' passes.  (Boy, vc-
list-files is getting a lot of churn today.  I'm thinking that post-release, it 
would be nice to start using gnulib-tool as a prerequisite strap to 
bootstrapping autoconf; by removing upstream files from autoconf.git, it cuts 
down on the churn).

The package.m4 change is unique to autoconf - even though our manual documents 
that autotest users should distribute both `testsuite' and `package.m4', that 
is because users don't necessarily have m4 installed, and they can't regenerate 
`testsuite' if the package omits their distribution.  But autoconf users DO 
have m4 installed, and distributing files that can be rebuilt during 'make' is 
pointless.

From: Eric Blake <address@hidden>
Date: Thu, 3 Apr 2008 11:02:50 -0600
Subject: [PATCH] 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>
---
 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 /'
-- 
1.5.4