mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2024-12-03 02:00:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

More maintainer tweaks: pass 'make maintainer-distcheck'.

Browse Source 
* 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 <ebb9@byu.net>
This commit is contained in:
Eric Blake 2008-04-03 11:02:50 -06:00
parent 491715eda7
commit f752252f50
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,13 @@
2008-04-03 Eric Blake <ebb9@byu.net>
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.

2
GNUmakefile
View File

@ -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)

4
build-aux/vc-list-files
View File

@ -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

2
lib/autoconf/general.m4
View File

@ -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

8
tests/Makefile.am
View File

@ -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)

2
tests/atlocal.in
View File

@ -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 /'