2010-06-26 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ Update program --help output to match current GCS.
+ * configure.ac: Set and substitute PACKAGE_URL if AC_PACKAGE_URL
+ is not defined, for compatibility to Autoconf < 2.64.
+ * Makefile.am (do_subst): Substitute PACKAGE_BUGREPORT and
+ PACKAGE_URL.
+ (sc_diff_automake_in_automake): Update number of diff lines for
+ additional substitutions.
+ * aclocal.in (usage): Use PACKAGE_BUGREPORT. Point to Automake
+ home page and GNU general help page.
+ * automake.in (usage): Likewise.
+ * doc/automake.texi: New flag PACKAGE_BUGREPORT, to factor email
+ address.
+ (Introduction, Creating amhello, amhello Explained, Options):
+ Use it throughout.
+ * lib/Automake/Makefile.am (do_subst): Substitute
+ PACKAGE_BUGREPORT.
+ * lib/Automake/Config.in ($PACKAGE_BUGREPORT): New global.
+ * lib/Automake/ChannelDefs.pm: Use it for footer of fatal
+ messages.
+
Clean up @var handling in the manual.
* doc/automake.texi: Throughout the manual, lower-case @var
names, replace a few one-character names.
do_subst = sed \
-e 's,[@]APIVERSION[@],$(APIVERSION),g' \
-e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+ -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \
+ -e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \
-e 's,[@]PATH_SEPARATOR[@],$(PATH_SEPARATOR),g' \
-e 's,[@]PERL[@],$(PERL),g' \
-e 's,[@]PERL_THREADS[@],$(PERL_THREADS),g' \
maintainer-check: $(syntax_check_rules)
## This check avoids accidental configure substitutions in the source.
-## There are exactly 6 lines that should be modified. This works out
-## to 22 lines of diffs.
+## There are exactly 8 lines that should be modified. This works out
+## to 28 lines of diffs.
sc_diff_automake_in_automake:
- @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 22; then \
+ @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 28; then \
echo "found too many diffs between automake.in and automake" 1>&2; \
diff -c $(srcdir)/automake.in automake; \
exit 1; \
do_subst = sed \
-e 's,[@]APIVERSION[@],$(APIVERSION),g' \
-e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+ -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \
+ -e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \
-e 's,[@]PATH_SEPARATOR[@],$(PATH_SEPARATOR),g' \
-e 's,[@]PERL[@],$(PERL),g' \
-e 's,[@]PERL_THREADS[@],$(PERL_THREADS),g' \
maintainer-check: $(syntax_check_rules)
sc_diff_automake_in_automake:
- @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 22; then \
+ @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 28; then \
echo "found too many diffs between automake.in and automake" 1>&2; \
diff -c $(srcdir)/automake.in automake; \
exit 1; \
`none' turn off all the warnings
`error' treat warnings as errors
-Report bugs to <bug-automake\@gnu.org>.\n";
+" . 'Report bugs to <@PACKAGE_BUGREPORT@>.
+GNU Automake home page: <@PACKAGE_URL@>.
+General help using GNU software: <http://www.gnu.org/gethelp/>.
+';
exit $status;
}
write;
}
- print "\nReport bugs to <bug-automake\@gnu.org>.\n";
+ print '
+Report bugs to <@PACKAGE_BUGREPORT@>.
+GNU Automake home page: <@PACKAGE_URL@>.
+General help using GNU software: <http://www.gnu.org/gethelp/>.
+';
# --help always returns 0 per GNU standards.
exit 0;
+
+
ac_aux_dir=
for ac_dir in lib "$srcdir"/lib; do
for ac_t in install-sh install.sh shtool; do
AC_INIT([GNU Automake], [1.11], [bug-automake@gnu.org])
+m4_ifndef([AC_PACKAGE_URL],
+ [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/software/automake/])])
+
AC_CONFIG_SRCDIR(automake.in)
AC_CONFIG_AUX_DIR(lib)
@r{[}@var{\varname\}@r{]}
@end macro
+@set PACKAGE_BUGREPORT bug-automake@@gnu.org
+
@copying
This manual is for GNU Automake (version @value{VERSION},
@cindex E-mail, bug reports
Mail suggestions and bug reports for Automake to
-@email{bug-automake@@gnu.org}.
+@email{@value{PACKAGE_BUGREPORT}}.
@node Autotools Introduction
@chapter An Introduction to the Autotools
@example
~/amhello % @kbd{cat configure.ac}
-AC_INIT([amhello], [1.0], [bug-automake@@gnu.org])
+AC_INIT([amhello], [1.0], [@value{PACKAGE_BUGREPORT}])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_PROG_CC
AC_CONFIG_HEADERS([config.h])
Let us begin with the contents of @file{configure.ac}.
@example
-AC_INIT([amhello], [1.0], [bug-automake@@gnu.org])
+AC_INIT([amhello], [1.0], [@value{PACKAGE_BUGREPORT}])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_PROG_CC
AC_CONFIG_HEADERS([config.h])
@smallexample
@dots{}
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "bug-automake@@gnu.org"
+#define PACKAGE_BUGREPORT "@value{PACKAGE_BUGREPORT}"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "amhello 1.0"
bytes long. So, in most cases the maximum file name length will be
shorter than 256 characters. However you may run against broken tar
implementations that incorrectly handle file names longer than 99
-characters (please report them to @email{bug-automake@@gnu.org} so we
+characters (please report them to @email{@value{PACKAGE_BUGREPORT}} so we
can document this accurately).
@option{tar-pax} selects the new pax interchange format defined by POSIX
-# Copyright (C) 2002, 2003, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2006, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
header => ("####################\n" .
"## Internal Error ##\n" .
"####################\n"),
- footer => "\nPlease contact <bug-automake\@gnu.org>.",
+ footer => "\nPlease contact <$PACKAGE_BUGREPORT>.",
uniq_part => UP_NONE, ordered => 0;
register_channel 'gnu', type => 'warning';
-# Copyright (C) 2003, 2004, 2008 Free Software Foundation, Inc. -*- Perl -*-
+# -*- Perl -*-
+# Copyright (C) 2003, 2004, 2008, 2010 Free Software Foundation, Inc.
# @configure_input@
# This program is free software; you can redistribute it and/or modify
require Exporter;
our @ISA = qw (Exporter);
-our @EXPORT = qw ($APIVERSION $PACKAGE $VERSION $libdir $perl_threads);
+our @EXPORT = qw ($APIVERSION $PACKAGE $PACKAGE_BUGREPORT $VERSION $libdir
+ $perl_threads);
# Parameters set by configure. Not to be changed. NOTE: assign
# VERSION as string so that e.g. version 0.30 will print correctly.
our $APIVERSION = '@APIVERSION@';
our $PACKAGE = '@PACKAGE@';
+our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
our $VERSION = '@VERSION@';
our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
our $perl_threads = @PERL_THREADS@;
## Process this file with automake to create Makefile.in
-# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \
-e 's,[@]APIVERSION[@],$(APIVERSION),g' \
-e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+ -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \
-e 's,[@]PERL[@],$(PERL),g' \
-e 's,[@]PERL_THREADS[@],$(PERL_THREADS),g' \
-e 's,[@]SHELL[@],$(SHELL),g' \
@SET_MAKE@
-# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \
-e 's,[@]APIVERSION[@],$(APIVERSION),g' \
-e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+ -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \
-e 's,[@]PERL[@],$(PERL),g' \
-e 's,[@]PERL_THREADS[@],$(PERL_THREADS),g' \
-e 's,[@]SHELL[@],$(SHELL),g' \
projects / thirdparty / automake.git / commitdiff
