From 5a289480393e6ed0679be099dd2117c20ba2946f Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 26 Oct 2012 14:00:35 +0200
Subject: AM_PROG_MKDIR_P: remove as obsolete, this time for good
This commit basically reverts v1.12.4-158-gdf23daf, re-instating
commit v1.12-20-g8a1c64f.
Support for the obsolescent 'AM_PROG_MKDIR_P' m4 macro has been
deprecated in the documentation and with runtime warnings since
Automake 1.12.1. Still, when we released Automake 1.13, we had
to delay that macro's removal, since at the time the last released
version of GNU gettext still AC_REQUIRE's AM_PROG_MKDIR_P via its
'intl.m4' and 'po.m4' files, which are pulled into *many* projects.
But it's now time to remove AM_PROG_MKDIR_P once and for all.
Projects still needing to work with older gettext releases will
be able to do so by adding a definition like
AC_DEFUN([AM_PROG_MKDIR_P], [AC_PROG_MKDIR_P([$@])])
to their 'acinclude.m4' file or to another local '*.m4' file.
* m4/mkdirp.m4: Delete.
* Makefile.am (dist_automake_ac_DATA): Remove it.
* automake.in (scan_autoconf_traces): Don't handle, nor warn about,
AM_PROG_MKDIR_P.
* doc/automake.texi (Obsolete Macros): Delete (it only spoke about
AM_PROG_MKDIR_P).
* t/gettext-macros.sh: Adjust.
* t/mkdirp-deprecation.sh: Delete.
* t/list-of-tests.mk: Don't list it.
Signed-off-by: Stefano Lattarini
---
Makefile.am | 1 -
automake.in | 9 ---------
doc/automake.texi | 40 ----------------------------------------
m4/mkdirp.m4 | 31 -------------------------------
t/gettext-macros.sh | 13 +++++--------
t/list-of-tests.mk | 1 -
t/mkdirp-deprecation.sh | 48 ------------------------------------------------
7 files changed, 5 insertions(+), 138 deletions(-)
delete mode 100644 m4/mkdirp.m4
delete mode 100755 t/mkdirp-deprecation.sh
diff --git a/Makefile.am b/Makefile.am
index 0e959da8f..e6297870a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -276,7 +276,6 @@ dist_automake_ac_DATA = \
m4/make.m4 \
m4/minuso.m4 \
m4/missing.m4 \
- m4/mkdirp.m4 \
m4/options.m4 \
m4/protos.m4 \
m4/python.m4 \
diff --git a/automake.in b/automake.in
index 32389f4ae..9c0c8b9cc 100644
--- a/automake.in
+++ b/automake.in
@@ -5128,7 +5128,6 @@ sub scan_autoconf_traces ($)
AC_REQUIRE_AUX_FILE => 1,
AC_SUBST_TRACE => 1,
AM_AUTOMAKE_VERSION => 1,
- AM_PROG_MKDIR_P => 0, # FIXME: to be removed in 1.14
AM_CONDITIONAL => 2,
_AM_EXTRA_RECURSIVE_TARGETS => 1,
AM_GNU_GETTEXT => 0,
@@ -5284,14 +5283,6 @@ sub scan_autoconf_traces ($)
$seen_automake_version = 1;
}
- elsif ($macro eq 'AM_PROG_MKDIR_P') # FIXME: to be removed in 1.14
- {
- msg 'obsolete', $where, <<'EOF';
-The 'AM_PROG_MKDIR_P' macro is deprecated, and will soon be removed.
-You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead,
-and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.
-EOF
- }
elsif ($macro eq 'AM_CONDITIONAL')
{
$configure_cond{$args[1]} = $where;
diff --git a/doc/automake.texi b/doc/automake.texi
index 40d3fc0b7..7058545ec 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -3880,7 +3880,6 @@ Automake ships with several Autoconf macros that you can use from your
@menu
* Public Macros:: Macros that you can use.
-* Obsolete Macros:: Macros that will soon be removed.
* Private Macros:: Macros that you should not use.
@end menu
@@ -4047,45 +4046,6 @@ define @code{WITH_DMALLOC} and add @option{-ldmalloc} to @code{LIBS}.
@end table
-@node Obsolete Macros
-@subsection Obsolete Macros
-@cindex obsolete macros
-@cindex autoupdate
-
-Although using some of the following macros was required in past
-releases, you should not use any of them in new code. @emph{All
-these macros will be removed in the next major Automake version};
-if you are still using them, running @command{autoupdate} should
-adjust your @file{configure.ac} automatically (@pxref{autoupdate
-Invocation, , Using @command{autoupdate} to Modernize
-@file{configure.ac}, autoconf, The Autoconf Manual}).
-@emph{Do it NOW!}
-
-@table @code
-
-@item AM_PROG_MKDIR_P
-@acindex AM_PROG_MKDIR_P
-@cindex @code{mkdir -p}, macro check
-@vindex MKDIR_P
-@vindex mkdir_p
-
-From Automake 1.8 to 1.9.6 this macro used to define the output
-variable @code{mkdir_p} to one of @code{mkdir -p}, @code{install-sh
--d}, or @code{mkinstalldirs}.
-
-Nowadays Autoconf provides a similar functionality with
-@code{AC_PROG_MKDIR_P} (@pxref{Particular Programs, , Particular
-Program Checks, autoconf, The Autoconf Manual}), however this defines
-the output variable @code{MKDIR_P} instead. In case you are still
-using the @code{AM_PROG_MKDIR_P} macro in your @file{configure.ac},
-or its provided variable @code{$(mkdir_p)} in your @file{Makefile.am},
-you are advised to switch ASAP to the more modern Autoconf-provided
-interface instead; both the macro and the variable @emph{will be
-removed} in the next major Automake release.
-
-@end table
-
-
@node Private Macros
@subsection Private Macros
diff --git a/m4/mkdirp.m4 b/m4/mkdirp.m4
deleted file mode 100644
index 93c12b0b7..000000000
--- a/m4/mkdirp.m4
+++ /dev/null
@@ -1,31 +0,0 @@
-## -*- Autoconf -*-
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for 'mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl FIXME to be removed in Automake 1.14.
-AC_DIAGNOSE([obsolete],
-[$0: this macro is deprecated, and will soon be removed.
-You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
-and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
index f6424ae6f..cbc5565b3 100755
--- a/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
@@ -61,10 +61,7 @@ AM_GNU_GETTEXT
AM_GNU_GETTEXT_VERSION([$autopoint_version])
END
-if $am_gettextize_command --force && test -f m4/gettext.m4; then
- echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh
- echo "export ACLOCAL_PATH" >> get.sh
-else
+if ! ($am_gettextize_command --force && test -f m4/gettext.m4); then
# Older versions of gettext might not have a gettextize program
# available, but this doesn't mean the user hasn't made the gettext
# macros available, e.g., by properly setting ACLOCAL_PATH.
@@ -78,12 +75,12 @@ else
fi
fi
-cat >> get.sh <<'END'
+echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh
+echo "export ACLOCAL_PATH" >> get.sh
+
# Even recent versions of gettext used the now-obsolete 'AM_PROG_MKDIR_P'
# m4 macro. So we need the following to avoid spurious errors.
-ACLOCAL="$ACLOCAL -Wno-obsolete"
-AUTOMAKE="$AUTOMAKE -Wno-obsolete"
-END
+echo 'AC_DEFUN([AM_PROG_MKDIR_P], [AC_PROG_MKDIR_P([$@])])' >> m4/mk-dirp.m4
. ./get.sh
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 425e545d8..f82fcbc85 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -683,7 +683,6 @@ t/missing3.sh \
t/am-missing-prog.sh \
t/missing-auxfile-stops-makefiles-creation.sh \
t/mkdir_p.sh \
-t/mkdirp-deprecation.sh \
t/mkinstall.sh \
t/mkinst2.sh \
t/mkinst3.sh \
diff --git a/t/mkdirp-deprecation.sh b/t/mkdirp-deprecation.sh
deleted file mode 100755
index 8482dea36..000000000
--- a/t/mkdirp-deprecation.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# Check that the AM_PROG_MKDIR_P macro is deprecated. It will be
-# be removed in the next major Automake release.
-
-. ./defs || exit 1
-
-echo AM_PROG_MKDIR_P >> configure.ac
-: > Makefile.am
-
-grep_err ()
-{
- loc='^configure.ac:4:'
- grep "$loc.*AM_PROG_MKDIR_P.*deprecated" stderr
- grep "$loc.* use .*AC_PROG_MKDIR_P" stderr
- grep "$loc.* use '\$(MKDIR_P)' instead of '\$(mkdir_p)'.*Makefile" stderr
-}
-
-$ACLOCAL
-
-$AUTOCONF -Werror -Wobsolete 2>stderr && { cat stderr >&2; exit 1; }
-cat stderr >&2
-grep_err
-
-$AUTOCONF -Werror -Wno-obsolete
-
-#AUTOMAKE_fails
-#grep_err
-AUTOMAKE_fails --verbose -Wnone -Wobsolete
-grep_err
-
-$AUTOMAKE -Wno-obsolete
-
-:
--
cgit v1.2.1
From ea33584cdac1597e90b3e2dbe4d3fd09d77bae0b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 28 Dec 2012 18:49:18 +0100
Subject: post-release: major version bump
This is for the master branch.
* configure.ac, m4/amversion.m4: Bump version to 1.13a.
Signed-off-by: Stefano Lattarini
---
configure.ac | 2 +-
m4/amversion.m4 | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4ec766183..f97ec87e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
# along with this program. If not, see .
AC_PREREQ([2.69])
-AC_INIT([GNU Automake], [1.13], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.13a], [bug-automake@gnu.org])
AC_CONFIG_SRCDIR([automake.in])
AC_CONFIG_AUX_DIR([lib])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 03f8c02f2..30d3871ec 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -12,10 +12,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13'
+[am__api_version='1.13a'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.13], [],
+m4_if([$1], [1.13a], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13])dnl
+[AM_AUTOMAKE_VERSION([1.13a])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
--
cgit v1.2.1
From 7326c52ebc428f4f14bdc24df05b528827866fd6 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Sat, 24 Nov 2012 20:32:48 +0100
Subject: aclocal: allow third-party macros take precedence over automake ones
It makes sense to allow "local system-wide" m4 macros take precedence
over built-in macros (defined in the aclocal versioned m4 directory
"${prefix}/share/aclocal-${APIVERSION}"), the same way we allow
"environment-level" m4 macros (through the ACLOCAL_PATH environment
variable ) take precedence over system-wide third-party macros.
An example: after this change, a definition of AM_PROG_VALAC placed
in file (say) '/usr/local/share/aclocal/my-vala.m4' should take
precedence over the same-named automake-provided macro defined in
file '/usr/local/share/aclocal-1.14/vala.m4'.
Even more importantly, after this change, m4 macros accessible
through $ACLOCAL_PATH entries will take precedence over m4 macros
defined in the aclocal versioned m4 directory; it was quite counter
intuitive that it was not the case before.
* aclocal.in (scan_m4_files): Search files in @system_includes before
files in @automake_includes.
* t/aclocal-acdir.sh: Adjust.
* t/aclocal-path-precedence.sh: Likewise.
* t/dirlist.sh: Likewise.
* doc/automake.texi: Adjust.
* NEWS: Update.
Signed-off-by: Stefano Lattarini
---
NEWS | 15 +++++++++++
aclocal.in | 2 +-
doc/automake.texi | 64 +++++++++++++++++++-------------------------
t/aclocal-acdir.sh | 10 +++----
t/aclocal-path-precedence.sh | 18 ++++++++-----
t/dirlist.sh | 10 +++----
6 files changed, 65 insertions(+), 54 deletions(-)
diff --git a/NEWS b/NEWS
index e672ad11b..bc86fed50 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+New in 1.14:
+
+* Aclocal search path:
+
+ - Third-party m4 files located in the system-wide aclocal directory,
+ as well as in any directory listed in the ACLOCAL_PATH environment
+ variable, now take precedence over "built-in" Automake macros.
+ For example, assuming Automake is installed in the '/usr/local'
+ hierarchy, a definition of the AM_PROG_VALAC macro found in file
+ (say) '/usr/local/share/aclocal/my-vala.m4' should take precedence
+ over the same-named automake-provided macro, as defined in file
+ '/usr/local/share/aclocal-1.14/vala.m4'.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
New in 1.13:
* Version requirements:
diff --git a/aclocal.in b/aclocal.in
index 05b89e7e3..39351ad23 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -411,8 +411,8 @@ sub scan_m4_files ()
scan_m4_dirs (FT_USER, !$install, $user_includes[0]);
scan_m4_dirs (FT_USER, 1, @user_includes[1..$#user_includes]);
}
- scan_m4_dirs (FT_AUTOMAKE, 1, @automake_includes);
scan_m4_dirs (FT_SYSTEM, 1, @system_includes);
+ scan_m4_dirs (FT_AUTOMAKE, 1, @automake_includes);
# Construct a new function that does the searching. We use a
# function (instead of just evaluating $search in the loop) so that
diff --git a/doc/automake.texi b/doc/automake.texi
index c0b1abf79..3dcfcc594 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -3318,15 +3318,10 @@ way as it is for @command{automake} (@pxref{automake Invocation}).
@cindex Macro search path
@cindex @command{aclocal} search path
-By default, @command{aclocal} searches for @file{.m4} files in the following
-directories, in this order:
+By default, @command{aclocal} searches for @file{.m4} files in the
+following directories, in this order:
@table @code
-@item @var{acdir-APIVERSION}
-This is where the @file{.m4} macros distributed with Automake itself
-are stored. @var{APIVERSION} depends on the Automake release used;
-for example, for Automake 1.11.x, @var{APIVERSION} = @code{1.11}.
-
@item @var{acdir}
This directory is intended for third party @file{.m4} files, and is
configured when @command{automake} itself is built. This is
@@ -3334,14 +3329,19 @@ configured when @command{automake} itself is built. This is
expands to @file{$@{prefix@}/share/aclocal/}. To find the compiled-in
value of @var{acdir}, use the @option{--print-ac-dir} option
(@pxref{aclocal Options}).
+
+@item @var{acdir-APIVERSION}
+This is where the @file{.m4} macros distributed with Automake itself
+are stored. @var{APIVERSION} depends on the Automake release used;
+for example, for Automake 1.11.x, @var{APIVERSION} = @code{1.11}.
@end table
As an example, suppose that @command{automake-1.11.2} was configured with
@option{--prefix=@-/usr/local}. Then, the search path would be:
@enumerate
-@item @file{/usr/local/share/aclocal-1.11.2/}
@item @file{/usr/local/share/aclocal/}
+@item @file{/usr/local/share/aclocal-1.11.2/}
@end enumerate
The paths for the @var{acdir} and @var{acdir-APIVERSION} directories can
@@ -3363,8 +3363,8 @@ Any extra directories specified using @option{-I} options
@enumerate
@item @file{/foo}
@item @file{/bar}
-@item @var{acdir}-@var{APIVERSION}
@item @var{acdir}
+@item @var{acdir}-@var{APIVERSION}
@end enumerate
@subsubheading Modifying the Macro Search Path: @file{dirlist}
@@ -3391,13 +3391,14 @@ and that @command{aclocal} was called with the @samp{-I /foo -I /bar} options.
Then, the search path would be
@c @code looks better than @file here
+@c See test aclocal-dirlist.sh
@enumerate
@item @code{/foo}
@item @code{/bar}
-@item @var{acdir}-@var{APIVERSION}
@item @var{acdir}
@item @code{/test1}
@item @code{/test2}
+@item @var{acdir}-@var{APIVERSION}
@end enumerate
@noindent
@@ -3414,19 +3415,22 @@ If the @option{--system-acdir=@var{dir}} option is used, then
directories are
@c @code looks better than @file here
+@c Keep in sync with aclocal-path-precedence.sh
@enumerate
-@item @code{/usr/share/aclocal-1.11/}
@item @code{/usr/share/aclocal/}
+@item @code{/usr/share/aclocal-1.11/}
@end enumerate
-However, suppose further that many packages have been manually
-installed on the system, with $prefix=/usr/local, as is typical. In
+However, suppose further that many packages have been manually installed
+on the system, with @code{$@{prefix@}=/usr/local}, as is typical. In
that case, many of these ``extra'' @file{.m4} files are in
-@file{/usr/local/share/aclocal}. The only way to force
-@file{/usr/bin/aclocal} to find these ``extra'' @file{.m4} files is to
-always call @samp{aclocal -I /usr/local/share/aclocal}. This is
-inconvenient. With @file{dirlist}, one may create a file
-@file{/usr/share/aclocal/dirlist} containing only the single line
+@file{/usr/local/share/aclocal}. A way to force @file{/usr/bin/aclocal}
+to find these ``extra'' @file{.m4} files is to export @code{ACLOCAL_PATH}
+to @samp{/usr/local/share/aclocal}. This is a little inconvenient,
+since it requires either explicit user cooperation, or editing of the
+system global shell initialization file. With @file{dirlist}, one may
+create a file @file{/usr/share/aclocal/dirlist} containing only the
+single line
@example
/usr/local/share/aclocal
@@ -3435,20 +3439,18 @@ inconvenient. With @file{dirlist}, one may create a file
Now, the ``default'' search path on the affected system is
@c @code looks better than @file here
+@c See test aclocal-dirlist.sh
@enumerate
-@item @code{/usr/share/aclocal-1.11/}
@item @code{/usr/share/aclocal/}
@item @code{/usr/local/share/aclocal/}
+@item @code{/usr/share/aclocal-1.11/}
@end enumerate
-without the need for @option{-I} options; @option{-I} options can be reserved
-for project-specific needs (@file{my-source-dir/m4/}), rather than
-using it to work around local system-dependent tool installation
-directories.
+without the need of any explicit @code{ACLOCAL_PATH} setting.
Similarly, @file{dirlist} can be handy if you have installed a local
-copy of Automake in your account and want @command{aclocal} to look for
-macros installed at other places on the system.
+copy of Automake in your account and want @command{aclocal} to look
+for macros installed at other places on the system.
@anchor{ACLOCAL_PATH}
@subsubheading Modifying the Macro Search Path: @file{ACLOCAL_PATH}
@@ -3476,16 +3478,6 @@ Conversely to @file{dirlist}, @env{ACLOCAL_PATH} is useful if you are
using a global copy of Automake and want @command{aclocal} to look for
macros somewhere under your home directory.
-@subsubheading Planned future incompatibilities
-
-The order in which the directories in the macro search path are currently
-looked up is confusing and/or suboptimal in various aspects, and is
-probably going to be changed in the future Automake release. In
-particular, directories in @env{ACLOCAL_PATH} and @file{@var{acdir}}
-might end up taking precedence over @file{@var{acdir-APIVERSION}}, and
-directories in @file{@var{acdir}/dirlist} might end up taking precedence
-over @file{@var{acdir}}. @emph{This is a possible future incompatibility!}
-
@node Extending aclocal
@subsection Writing your own aclocal macros
@@ -3513,7 +3505,7 @@ aclocal_DATA = mymacro.m4 myothermacro.m4
@noindent
Please do use @file{$(datadir)/aclocal}, and not something based on
the result of @samp{aclocal --print-ac-dir} (@pxref{Hard-Coded Install
-Paths}, for arguments). It might also be helpful to suggest to
+Paths}, for rationale). It might also be helpful to suggest to
the user to add the @file{$(datadir)/aclocal} directory to his
@env{ACLOCAL_PATH} variable (@pxref{ACLOCAL_PATH}) so that
@command{aclocal} will find the @file{.m4} files installed by your
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh
index 944604b44..8b3f24461 100755
--- a/t/aclocal-acdir.sh
+++ b/t/aclocal-acdir.sh
@@ -15,8 +15,8 @@
# along with this program. If not, see .
# Test aclocal's '--automake-acdir' and '--system-acdir' options. Also
-# check that stuff in the automake acdir takes precedence over stuff in
-# the system acdir.
+# check that stuff in the system acdir takes precedence over stuff in
+# the automake acdir.
. test-init.sh
@@ -65,14 +65,14 @@ $FGREP 'my--macro' configure
rm -rf autom4te*.cache
-# Stuff in automake acdir takes precedence over stuff in system acdir.
+# Stuff in system acdir takes precedence over stuff in automake acdir.
cat > am/bar.m4 <<'END'
AC_DEFUN([MY_MACRO], [am--macro])
END
$ACLOCAL --automake-acdir am --system-acdir sys
$AUTOCONF --force
$FGREP 'fake--init--automake' configure
-$FGREP 'am--macro' configure
-$FGREP 'my--macro' configure && exit 1 # Just to be sure.
+$FGREP 'my--macro' configure
+$FGREP 'am--macro' configure && exit 1
:
diff --git a/t/aclocal-path-precedence.sh b/t/aclocal-path-precedence.sh
index 054523178..9aee98aae 100755
--- a/t/aclocal-path-precedence.sh
+++ b/t/aclocal-path-precedence.sh
@@ -46,10 +46,16 @@ cat > mdir3/bar.m4 << 'END'
AC_DEFUN([BAR_MACRO], [::pass-bar::])
END
-cat > mdir2/quux.m4 << 'END'
-AC_DEFUN([AM_INIT_AUTOMAKE], [::fail-init::])
-AC_DEFUN([AC_PROG_LIBTOOL], [::pass-libtool::])
-AC_DEFUN([AM_GNU_GETTEXT], [::pass-gettext::])
+cat > mdir2/quux-a.m4 << 'END'
+AC_DEFUN([AM_INIT_AUTOMAKE], [::pass-am-init::])
+END
+
+cat > mdir2/quux-b.m4 << 'END'
+AC_DEFUN([AC_PROG_LIBTOOL], [::pass-libtool::])
+END
+
+cat > mdir2/quux-c.m4 << 'END'
+AC_DEFUN([AM_GNU_GETTEXT], [::pass-gettext::])
END
cat > sysdir/libtool.m4 << 'END'
@@ -81,9 +87,9 @@ $FGREP '::pass-bar::' configure
$FGREP '::pass-gettext::' configure
$FGREP '::pass-libtool::' configure
-# Directories in ACLOCAL_PATH shouldn't take precedence over the internal
+# Directories in ACLOCAL_PATH shoul take precedence over the internal
# automake acdir (typically '${prefix}/share/aclocal-${APIVERSION}').
-$FGREP 'am__api_version' configure
+$FGREP '::pass-am-init::' configure
# A final sanity check.
$FGREP '::fail' configure && exit 1
diff --git a/t/dirlist.sh b/t/dirlist.sh
index 2dc903886..6daf6a5b8 100755
--- a/t/dirlist.sh
+++ b/t/dirlist.sh
@@ -35,9 +35,9 @@ module=[$1]
AC_SUBST(module)])
END
-cat >dirlist-test/init.m4 <dirlist-test/init.m4 <<'END'
+AC_DEFUN([AM_INIT_AUTOMAKE], [Hey, I should be included, really!])
+END
$ACLOCAL --system-acdir acdir
$AUTOCONF
@@ -49,8 +49,6 @@ grep m4_include aclocal.m4 && exit 1
grep 'GUILE-VERSION' configure
-# This bug can occur only when we do a VPATH build of Automake
-# but it's OK because VPATH builds are done by 'make distcheck'.
-grep 'I should not be included' configure && exit 1
+$FGREP 'Hey, I should be included, really!' configure
:
--
cgit v1.2.1
From 880595d0b4930c51f96da50f755f2f2f882fe5b4 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Wed, 22 Aug 2012 16:40:15 +0200
Subject: compile: remove support for $(INCLUDES)
It has already been deprecated in the manual and by warnings in the
'obsolete' category for ages (at least since 2003), in favour of
AM_CPPFLAGS. Automake-NG has removed support for it already. And
the warnings in the obsolete category are on by default since the
1.12.4 release.
So, by removing it in Automake 1.14, we will simplify the transition
path for people that want to switch to Automake-NG.
See also Automake-NG commit v1.12-267-g6b74968 of 2012-05-21,
"[ng] compile: don't support $(INCLUDES) anymore, it's obsolete".
* NEWS, doc/automake.texi: Update.
* automake.in (generate_makefile): Reject INCLUDES unconditionally.
In all languages: don't add $(INCLUDES) to the compiler command line.
* t/includes-deprecation.sh: New test.
* t/list-of-tests.mk: Add it.
* t/werror2.sh : Adjust to avoid spurious failures.
* t/pluseq5.sh: Likewise.
* t/warnopts.sh: Likewise.
Suggested-by: Paolo Bonzini
Signed-off-by: Stefano Lattarini
---
NEWS | 5 +++++
automake.in | 29 ++++++++++++++---------------
doc/automake.texi | 14 ++++----------
t/includes-no-more.sh | 32 ++++++++++++++++++++++++++++++++
t/list-of-tests.mk | 1 +
t/pluseq5.sh | 20 ++++----------------
t/warnopts.sh | 36 ++++++++++++++++++------------------
t/werror2.sh | 1 -
8 files changed, 78 insertions(+), 60 deletions(-)
create mode 100755 t/includes-no-more.sh
diff --git a/NEWS b/NEWS
index 250749947..a8b2cdd7f 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,11 @@ New in 1.14:
over the same-named automake-provided macro, as defined in file
'/usr/local/share/aclocal-1.14/vala.m4'.
+* Obsolete features:
+
+ - Support for the long-obsolete $(INCLUDES) variable has been finally
+ removed, in favour of the modern equivalent $(AM_CPPFLAGS).
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.13:
diff --git a/automake.in b/automake.in
index 35aefd329..96ff68565 100644
--- a/automake.in
+++ b/automake.in
@@ -704,7 +704,7 @@ register_language ('name' => 'c',
'flags' => ['CFLAGS', 'CPPFLAGS'],
'ccer' => 'CC',
'compiler' => 'COMPILE',
- 'compile' => '$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)',
+ 'compile' => '$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)',
'lder' => 'CCLD',
'ld' => '$(CC)',
'linker' => 'LINK',
@@ -721,7 +721,7 @@ register_language ('name' => 'cxx',
'link' => '$(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
'autodep' => 'CXX',
'flags' => ['CXXFLAGS', 'CPPFLAGS'],
- 'compile' => '$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)',
+ 'compile' => '$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)',
'ccer' => 'CXX',
'compiler' => 'CXXCOMPILE',
'compile_flag' => '-c',
@@ -740,7 +740,7 @@ register_language ('name' => 'objc',
'link' => '$(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
'autodep' => 'OBJC',
'flags' => ['OBJCFLAGS', 'CPPFLAGS'],
- 'compile' => '$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)',
+ 'compile' => '$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)',
'ccer' => 'OBJC',
'compiler' => 'OBJCCOMPILE',
'compile_flag' => '-c',
@@ -758,7 +758,7 @@ register_language ('name' => 'objcxx',
'link' => '$(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
'autodep' => 'OBJCXX',
'flags' => ['OBJCXXFLAGS', 'CPPFLAGS'],
- 'compile' => '$(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)',
+ 'compile' => '$(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)',
'ccer' => 'OBJCXX',
'compiler' => 'OBJCXXCOMPILE',
'compile_flag' => '-c',
@@ -776,7 +776,7 @@ register_language ('name' => 'upc',
'link' => '$(UPCLD) $(AM_UPCFLAGS) $(UPCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
'autodep' => 'UPC',
'flags' => ['UPCFLAGS', 'CPPFLAGS'],
- 'compile' => '$(UPC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_UPCFLAGS) $(UPCFLAGS)',
+ 'compile' => '$(UPC) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_UPCFLAGS) $(UPCFLAGS)',
'ccer' => 'UPC',
'compiler' => 'UPCCOMPILE',
'compile_flag' => '-c',
@@ -878,7 +878,7 @@ register_language ('name' => 'asm',
'config_vars' => ['CCAS', 'CCASFLAGS'],
'flags' => ['CCASFLAGS'],
- # Users can set AM_CCASFLAGS to include DEFS, INCLUDES,
+ # Users can set AM_CCASFLAGS to include $(DEFS) or
# or anything else required. They can also set CCAS.
# Or simply use Preprocessed Assembler.
'compile' => '$(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)',
@@ -895,7 +895,7 @@ register_language ('name' => 'cppasm',
'autodep' => 'CCAS',
'flags' => ['CCASFLAGS', 'CPPFLAGS'],
- 'compile' => '$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)',
+ 'compile' => '$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)',
'ccer' => 'CPPAS',
'compiler' => 'CPPASCOMPILE',
'compile_flag' => '-c',
@@ -949,7 +949,7 @@ register_language ('name' => 'ppfc',
'flags' => ['FCFLAGS', 'CPPFLAGS'],
'ccer' => 'PPFC',
'compiler' => 'PPFCCOMPILE',
- 'compile' => '$(FC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FCFLAGS) $(FCFLAGS)',
+ 'compile' => '$(FC) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FCFLAGS) $(FCFLAGS)',
'compile_flag' => '-c',
'output_flag' => '-o',
'libtool_tag' => 'FC',
@@ -959,9 +959,9 @@ register_language ('name' => 'ppfc',
# Preprocessed Fortran 77
#
# The current support for preprocessing Fortran 77 just involves
-# passing "$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
-# $(CPPFLAGS)" as additional flags to the Fortran 77 compiler, since
-# this is how GNU Make does it; see the "GNU Make Manual, Edition 0.51
+# passing "$(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)"
+# as additional flags to the Fortran 77 compiler, since this is
+# how GNU Make does it; see the "GNU Make Manual, Edition 0.51
# for 'make' Version 3.76 Beta" (specifically, from info file
# '(make)Catalogue of Rules').
#
@@ -981,7 +981,7 @@ register_language ('name' => 'ppf77',
'flags' => ['FFLAGS', 'CPPFLAGS'],
'ccer' => 'PPF77',
'compiler' => 'PPF77COMPILE',
- 'compile' => '$(F77) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)',
+ 'compile' => '$(F77) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)',
'compile_flag' => '-c',
'output_flag' => '-o',
'libtool_tag' => 'F77',
@@ -7830,9 +7830,8 @@ sub generate_makefile ($$)
}
# Catch some obsolete variables.
- msg_var ('obsolete', 'INCLUDES',
- "'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')")
- if var ('INCLUDES');
+ reject_var 'INCLUDES', "'INCLUDES' is the obsolete name for " .
+ "'AM_CPPFLAGS' (or '*_CPPFLAGS')";
# Must do this after reading .am file.
define_variable ('subdir', $relative_dir, INTERNAL);
diff --git a/doc/automake.texi b/doc/automake.texi
index b86770cec..bac074cd5 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -6072,12 +6072,6 @@ files in the source directory are ignored.
@code{AM_CPPFLAGS} is ignored in preference to a per-executable (or
per-library) @code{_CPPFLAGS} variable if it is defined.
-@item INCLUDES
-This does the same job as @code{AM_CPPFLAGS} (or any per-target
-@code{_CPPFLAGS} variable if it is used). It is an older name for the
-same functionality. This variable is deprecated; we suggest using
-@code{AM_CPPFLAGS} and per-target @code{_CPPFLAGS} instead.
-
@item AM_CFLAGS
This is the variable the @file{Makefile.am} author can use to pass
in additional C compiler flags. In some situations, this is
@@ -6410,8 +6404,8 @@ assembly code. This compiler must work a bit like a C compiler; in
particular it must accept @option{-c} and @option{-o}. The values of
@code{CCASFLAGS} and @code{AM_CCASFLAGS} (or its per-target
definition) is passed to the compilation. For preprocessed files,
-@code{DEFS}, @code{DEFAULT_INCLUDES}, @code{INCLUDES}, @code{CPPFLAGS}
-and @code{AM_CPPFLAGS} are also used.
+@code{DEFS}, @code{DEFAULT_INCLUDES}, @code{CPPFLAGS} and
+@code{AM_CPPFLAGS} are also used.
The autoconf macro @code{AM_PROG_AS} will define @code{CCAS} and
@code{CCASFLAGS} for you (unless they are already set, it simply sets
@@ -6500,7 +6494,7 @@ command used is as follows:
@table @file
@item .F
-@code{$(F77) -F $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)@*
+@code{$(F77) -F $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS)@*
$(AM_FFLAGS) $(FFLAGS)}
@item .r
@@ -6523,7 +6517,7 @@ is as follows:
@code{$(F77) -c $(AM_FFLAGS) $(FFLAGS)}
@item .F
-@code{$(F77) -c $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)@*
+@code{$(F77) -c $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS)@*
$(AM_FFLAGS) $(FFLAGS)}
@item .r
diff --git a/t/includes-no-more.sh b/t/includes-no-more.sh
new file mode 100755
index 000000000..eceaed6c5
--- /dev/null
+++ b/t/includes-no-more.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright (C) 2012 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+# Support for $(INCLUDES) has been removed.
+
+. test-init.sh
+
+echo AC_PROG_CC >> configure.ac
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+INCLUDES = -DFOO
+END
+
+$ACLOCAL
+AUTOMAKE_fails -Wnone -Wno-error
+grep "^Makefile\\.am:2:.* 'INCLUDES'.* obsolete.* 'AM_CPPFLAGS'" stderr
+
+:
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 4612d3ded..d835c8d09 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -501,6 +501,7 @@ t/help-silent.sh \
t/help-upc.sh \
t/hfs.sh \
t/implicit.sh \
+t/includes-no-more.sh \
t/init.sh \
t/init2.sh \
t/insh2.sh \
diff --git a/t/pluseq5.sh b/t/pluseq5.sh
index facab4e1d..64c5a6cda 100755
--- a/t/pluseq5.sh
+++ b/t/pluseq5.sh
@@ -24,9 +24,9 @@ END
cat > Makefile.am << 'END'
if CHECK
-INCLUDES = abc
+AM_CPPFLAGS = abc
endif
-INCLUDES += def
+AM_CPPFLAGS += def
END
$ACLOCAL
@@ -34,10 +34,10 @@ AUTOMAKE_fails
# We expect the following diagnostic:
#
-# Makefile.am:4: cannot apply '+=' because 'INCLUDES' is not defined in
+# Makefile.am:4: cannot apply '+=' because 'AM_CPPFLAGS' is not defined in
# Makefile.am:4: the following conditions:
# Makefile.am:4: !CHECK
-# Makefile.am:4: either define 'INCLUDES' in these conditions, or use
+# Makefile.am:4: either define 'AM_CPPFLAGS' in these conditions, or use
# Makefile.am:4: '+=' in the same conditions as the definitions.
# Is !CHECK mentioned?
@@ -45,16 +45,4 @@ grep ':.*!CHECK$' stderr
# Is there only one missing condition?
test $(grep -c ': ' stderr) -eq 1
-# By the way, Automake should suggest using AM_CPPFLAGS,
-# because INCLUDES is an obsolete name.
-grep AM_CPPFLAGS stderr
-
-# A way to suppress the obsolete warning is to use
-# -Wno-obsolete:
-echo 'AUTOMAKE_OPTIONS = -Wno-obsolete' >> Makefile.am
-AUTOMAKE_fails
-grep AM_CPPFLAGS stderr && exit 1
-# !CHECK should still be mentioned.
-grep ':.*!CHECK$' stderr
-
:
diff --git a/t/warnopts.sh b/t/warnopts.sh
index 65165b731..b9a538582 100755
--- a/t/warnopts.sh
+++ b/t/warnopts.sh
@@ -20,6 +20,7 @@
cat >>configure.ac <Makefile.am < Makefile.am << 'END'
+AUTOMAKE_OPTIONS = -Wno-unsupported
+if COND_FALSE
+AUTOMAKE_OPTIONS += no-dependencies
+endif
foo_SOURCES = unused
SUBDIRS = sub
END
-cat >sub/Makefile.am < sub/Makefile.am << 'END'
AUTOMAKE_OPTIONS = -Wno-syntax
-INCLUDES = -Ifoo
+if COND_FALSE
+AUTOMAKE_OPTIONS += no-dependencies
+endif
foo_SOURCES = unused
END
$ACLOCAL
AUTOMAKE_fails
# The expected diagnostic is
-# Makefile.am:3: warning: variable 'foo_SOURCES' is defined but no program or
-# library has 'foo' as canonical name (possible typo)
-# sub/Makefile.am:2: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS'
+# automake: warnings are treated as errors
+# Makefile.am:5: warning: variable 'foo_SOURCES' is defined but no program or
+# Makefile.am:5: library has 'foo' as canonical name (possible typo)
+# sub/Makefile.am:1: warning: 'AUTOMAKE_OPTIONS' cannot have conditional contents
grep '^Makefile.am:.*foo_SOURCES' stderr
-grep '^sub/Makefile.am:.*INCLUDES' stderr
-grep '^sub/Makefile.am:.*foo_SOURCES' stderr && exit 1
-grep '^Makefile.am:.*INCLUDES' stderr && exit 1
+grep '^sub/Makefile.am:.*AUTOMAKE_OPTIONS' stderr
+grep '^sub/Makefile.am:.*foo_SOURCES' stderr && Exit 1
+grep '^Makefile.am:.*AUTOMAKE_OPTIONS' stderr && Exit 1
# Only three lines of warnings.
-test $(grep -v 'warnings are treated as errors' stderr | wc -l) -eq 3
+test $(grep -v 'warnings are treated as errors' stderr | wc -l) = 3
-# On fast machines the autom4te.cache created during the above run of
-# $AUTOMAKE is likely to have the same time stamp as the configure.ac
-# created below; thus causing traces for the old configure.ac to be
-# used. We could do '$sleep', but it's faster to erase the
-# directory. (Erase autom4te*.cache, not autom4te.cache, because some
-# bogus installations of Autoconf use a versioned cache).
rm -rf autom4te*.cache
# If we add a global -Wnone, all warnings should disappear.
diff --git a/t/werror2.sh b/t/werror2.sh
index b1feeff21..18b3698f9 100755
--- a/t/werror2.sh
+++ b/t/werror2.sh
@@ -37,7 +37,6 @@ $MAKE
cat >Makefile.am <
Date: Sun, 23 Sep 2012 01:24:12 +0200
Subject: ACLOCAL_AMFLAGS: fully deprecate, with warnings in the 'obsolete'
category
Users are expected to use the AC_CONFIG_MACRO_DIR{,S} autoconf macros
instead. And the use of the '--install' aclocal option in ACLOCAL_AMFLAGS
has proved to be a bad idea anyway -- see automake bug#9037.
* NEWS: Update.
* t/aclocal-amflags.sh: Enhance and adjust.
* t/acloca14b.sh: Adjust.
* t/acloca22b.sh: Likewise.
* t/ax/distcheck-hook-m4.am: Likewise.
* t/dist-missing-m4.sh: Likewise.
* t/remake-renamed-m4-macro.sh: Likewise.
* t/remake-renamed-m4-macro-and-file.sh: Likewise.
* t/remake-renamed-m4-file.sh: Likewise.
* t/remake-moved-m4-file.sh: Likewise.
* t/remake-gnulib-remove-header.sh: Likewise.
* t/remake-gnulib-add-acsubst.sh: Likewise.
* t/remake-deleted-m4-file.sh: Likewise.
* t/remake-deleted-m4-file.sh: Likewise.
* t/libtool-macros.sh: Likewise.
* t/gettext-macros.sh: Likewise.
Signed-off-by: Stefano Lattarini
---
NEWS | 9 ++++++++-
automake.in | 6 ++++++
t/aclocal-amflags.sh | 15 ++++++++++++---
t/aclocal-deleted-header-aclocal-amflags.sh | 5 ++++-
t/aclocal-m4-include-are-scanned-aclocal-amflags.sh | 1 +
t/ax/distcheck-hook-m4.am | 2 ++
t/dist-missing-m4.sh | 5 +++--
t/gettext-macros.sh | 3 ++-
t/libtool-macros.sh | 5 ++---
t/remake-deleted-m4-file.sh | 5 +++--
t/remake-gnulib-add-acsubst.sh | 4 ++--
t/remake-gnulib-add-header.sh | 4 ++--
t/remake-gnulib-remove-header.sh | 4 ++--
t/remake-moved-m4-file.sh | 5 +++--
t/remake-renamed-m4-file.sh | 4 ++--
t/remake-renamed-m4-macro-and-file.sh | 4 ++--
t/remake-renamed-m4-macro.sh | 4 ++--
17 files changed, 58 insertions(+), 27 deletions(-)
diff --git a/NEWS b/NEWS
index a8b2cdd7f..2d6304305 100644
--- a/NEWS
+++ b/NEWS
@@ -11,11 +11,18 @@ New in 1.14:
over the same-named automake-provided macro, as defined in file
'/usr/local/share/aclocal-1.14/vala.m4'.
-* Obsolete features:
+* Obsolete and obsolescent features:
- Support for the long-obsolete $(INCLUDES) variable has been finally
removed, in favour of the modern equivalent $(AM_CPPFLAGS).
+ - Use of the special makefile variable 'ACLOCAL_AMFLAGS' is deprecated.
+ To specify locations of extra m4 files, the 'AC_CONFIG_MACRO_DIR' or
+ 'AC_CONFIG_MACRO_DIRS' (the latter introduced with autoconf 2.70)
+ should be used instead. And use of the '--install' aclocal option in
+ 'ACLOCAL_AMFLAGS' has proved to be a bad idea anyway -- see automake
+ bug#9037.
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.13:
diff --git a/automake.in b/automake.in
index 96ff68565..ffe16e22c 100644
--- a/automake.in
+++ b/automake.in
@@ -7832,6 +7832,12 @@ sub generate_makefile ($$)
# Catch some obsolete variables.
reject_var 'INCLUDES', "'INCLUDES' is the obsolete name for " .
"'AM_CPPFLAGS' (or '*_CPPFLAGS')";
+ if (my $amflags = var ('ACLOCAL_AMFLAGS'))
+ {
+ msg_var 'obsolete', $amflags,
+ "'ACLOCAL_AMFLAGS' is deprecated; use 'AC_CONFIG_MACRO_DIRS'"
+ . " in configure.ac instead";
+ }
# Must do this after reading .am file.
define_variable ('subdir', $relative_dir, INTERNAL);
diff --git a/t/aclocal-amflags.sh b/t/aclocal-amflags.sh
index 49bcf5f37..69bce3201 100755
--- a/t/aclocal-amflags.sh
+++ b/t/aclocal-amflags.sh
@@ -15,8 +15,8 @@
# along with this program. If not, see .
# Check that the obsolescent idiom of setting $(ACLOCAL_AMFLAGS) in
-# Makefile.am still works. Remove this test once support for this
-# obsolescent idiom is removed.
+# Makefile.am is warned against, but still works. Remove this test
+# once support for this obsolescent idiom is removed.
. test-init.sh
@@ -45,7 +45,16 @@ $ACLOCAL -I m4_1 >output 2>&1 || { cat output; exit 1; }
cat output
grep 'found macro' output && exit 1 # Sanity check.
$AUTOCONF
-$AUTOMAKE
+
+for opts in '' '-Wnone -Wobsolete'; do
+ AUTOMAKE_fails $opts
+ grep "Makefile\.am:.*'ACLOCAL_AMFLAGS' is deprecated" stderr
+ grep "Makefile\.am:.*'AC_CONFIG_MACRO_DIRS'.*configure\.ac.*instead" stderr
+done
+
+echo AUTOMAKE_OPTIONS = -Wall -Wno-obsolete >> Makefile.am
+cat Makefile.am # For debugging.
+$AUTOMAKE -Werror
./configure
test -f foo
diff --git a/t/aclocal-deleted-header-aclocal-amflags.sh b/t/aclocal-deleted-header-aclocal-amflags.sh
index ea47635c0..8f11ebdd5 100755
--- a/t/aclocal-deleted-header-aclocal-amflags.sh
+++ b/t/aclocal-deleted-header-aclocal-amflags.sh
@@ -22,7 +22,10 @@
. test-init.sh
-cat >>configure.ac < configure.ac <defs/f.m4
cat >>Makefile.am<<\EOF
ACLOCAL_AMFLAGS = -I defs
+AUTOMAKE_OPTIONS = -Wno-obsolete
testdist1: distdir
test -f $(distdir)/acinclude.m4
test -f $(distdir)/a.m4
diff --git a/t/ax/distcheck-hook-m4.am b/t/ax/distcheck-hook-m4.am
index 5d36102c6..262e370c9 100644
--- a/t/ax/distcheck-hook-m4.am
+++ b/t/ax/distcheck-hook-m4.am
@@ -15,6 +15,8 @@
## You should have received a copy of the GNU General Public License
## along with this program. If not, see .
+AUTOMAKE_OPTIONS = -Wno-obsolete
+
distcheck-hook:
@fatal () { echo "$@: $$*" >&2; exit 1; }; \
$(am__cd) $(distdir) && chmod u+w . && mkdir _m4 \
diff --git a/t/dist-missing-m4.sh b/t/dist-missing-m4.sh
index e0ed88614..c5eed848b 100755
--- a/t/dist-missing-m4.sh
+++ b/t/dist-missing-m4.sh
@@ -23,6 +23,7 @@
. test-init.sh
cat >> configure.ac <<'END'
+AC_CONFIG_MACRO_DIR([m4])
m4_pattern_forbid([^MY_])
MY_FOOBAR || exit 1
MY_ZARDOZ || exit 1
@@ -33,9 +34,9 @@ mkdir m4
echo 'AC_DEFUN([MY_FOOBAR], [:])' > m4/foobar.m4
echo 'AC_DEFUN([MY_ZARDOZ], [:])' > m4/zardoz.m4
-echo 'ACLOCAL_AMFLAGS = -I m4' > Makefile.am
+: > Makefile.am
-$ACLOCAL -I m4
+$ACLOCAL
$AUTOCONF
$AUTOMAKE
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
index 6d58c9c37..17045c611 100755
--- a/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
@@ -29,7 +29,8 @@ echo "# Automatically generated by $me." > get.sh
echo : >> get.sh
# The 'gettextize' and 'autopoint' scripts will look into Makefile.am.
-echo ACLOCAL_AMFLAGS = -I m4 > Makefile.am
+echo AUTOMAKE_OPTIONS = -Wno-obsolete > Makefile.am
+echo ACLOCAL_AMFLAGS = -I m4 >> Makefile.am
# Prefer autopoint to gettextize, since the more modern versions of the
# latter might unconditionally require user interaction to complete;
diff --git a/t/libtool-macros.sh b/t/libtool-macros.sh
index c50777b7c..ec84682a1 100755
--- a/t/libtool-macros.sh
+++ b/t/libtool-macros.sh
@@ -23,8 +23,7 @@
echo "# Automatically generated by $me." > get.sh
echo : >> get.sh
-# The 'libtoolize' script will look into Makefile.am.
-echo ACLOCAL_AMFLAGS = -I m4 > Makefile.am
+echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
if libtoolize --copy --install && test -f m4/libtool.m4; then
echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh
@@ -37,7 +36,7 @@ else
mkdir m4
echo AC_PROG_LIBTOOL >> configure.ac
# See below for an explanation about the use the of '-Wno-syntax'.
- if $ACLOCAL -Wno-syntax -I m4 --install && test -f m4/libtool.m4; then
+ if $ACLOCAL -Wno-syntax --install && test -f m4/libtool.m4; then
: # Libtool macros already accessible by default.
else
echo "skip_all_ \"couldn't find or get libtool macros\"" >> get.sh
diff --git a/t/remake-deleted-m4-file.sh b/t/remake-deleted-m4-file.sh
index 2499d82cd..d733a56c5 100755
--- a/t/remake-deleted-m4-file.sh
+++ b/t/remake-deleted-m4-file.sh
@@ -25,10 +25,11 @@
cat >> configure.ac <<'END'
FOO_MACRO
AC_OUTPUT
+dnl Deliberately put this late, for better coverage.
+AC_CONFIG_MACRO_DIR([m4])
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I m4
.PHONY: test
test:
test '$(the_answer)' -eq 42
@@ -46,7 +47,7 @@ cat > m4/bar.m4 <> configure.ac <<'END'
AC_PROG_CC
+AC_CONFIG_MACRO_DIRS([m4])
MY_MACROS
AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I m4
noinst_PROGRAMS = foo
foo_SOURCES = foo.c
BUILT_SOURCES = foo.h
@@ -70,7 +70,7 @@ int main (void) { return 0; }
typedef int checkfoo[1 - 2 * (foo != 42)];
END
-$ACLOCAL -I m4
+$ACLOCAL
$AUTOCONF
$AUTOMAKE
diff --git a/t/remake-gnulib-add-header.sh b/t/remake-gnulib-add-header.sh
index c70b3c672..db6bea186 100755
--- a/t/remake-gnulib-add-header.sh
+++ b/t/remake-gnulib-add-header.sh
@@ -25,6 +25,7 @@ required=cc
. test-init.sh
cat >> configure.ac <<'END'
+AC_CONFIG_MACRO_DIR([.])
AC_CONFIG_HEADERS([config.h])
AC_PROG_CC
MY_MACROS
@@ -32,7 +33,6 @@ AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I .
noinst_PROGRAMS = foo
foo_SOURCES = foo.c
BUILT_SOURCES = $(STDIO_H)
@@ -80,7 +80,7 @@ FILE *f;
int main () { return 0; }
END
-$ACLOCAL -I .
+$ACLOCAL
$AUTOHEADER
$AUTOMAKE
$AUTOCONF
diff --git a/t/remake-gnulib-remove-header.sh b/t/remake-gnulib-remove-header.sh
index 23fbfc81b..189bbe5d3 100755
--- a/t/remake-gnulib-remove-header.sh
+++ b/t/remake-gnulib-remove-header.sh
@@ -26,6 +26,7 @@ required=cc
. test-init.sh
cat >> configure.ac <<'END'
+AC_CONFIG_MACRO_DIR([.])
AC_CONFIG_HEADERS([config.h])
AC_PROG_CC
MY_MACROS
@@ -33,7 +34,6 @@ AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I .
noinst_PROGRAMS = foo
foo_SOURCES = foo.c
BUILT_SOURCES = $(STDIO_H)
@@ -79,7 +79,7 @@ FILE *f;
int main () { return 0; }
END
-$ACLOCAL -I .
+$ACLOCAL
$AUTOHEADER
$AUTOMAKE
$AUTOCONF
diff --git a/t/remake-moved-m4-file.sh b/t/remake-moved-m4-file.sh
index 3ca16801f..faed95d8b 100755
--- a/t/remake-moved-m4-file.sh
+++ b/t/remake-moved-m4-file.sh
@@ -21,11 +21,12 @@
cat >> configure.ac <<'END'
MY_MACRO
+AC_CONFIG_MACRO_DIRS([d1])
+AC_CONFIG_MACRO_DIRS([d2 d3])
AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I d1 -I d2 -I d3
.PHONY: test
test:
test '$(the_answer)' -eq 42
@@ -41,7 +42,7 @@ cat > d1/foo.m4 <<'END'
AC_DEFUN([FOO], [the_answer=42; AC_SUBST([the_answer])])
END
-$ACLOCAL -I d1
+$ACLOCAL
$AUTOCONF
$AUTOMAKE
diff --git a/t/remake-renamed-m4-file.sh b/t/remake-renamed-m4-file.sh
index ff99f1d54..462a2ce01 100755
--- a/t/remake-renamed-m4-file.sh
+++ b/t/remake-renamed-m4-file.sh
@@ -19,12 +19,12 @@
. test-init.sh
cat >> configure.ac <<'END'
+AC_CONFIG_MACRO_DIR([m4])
MY_MACRO
AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I m4
.PHONY: test
test:
test '$(the_answer)' -eq 42
@@ -40,7 +40,7 @@ cat > m4/foo.m4 <<'END'
AC_DEFUN([FOO], [the_answer=42; AC_SUBST([the_answer])])
END
-$ACLOCAL -I m4
+$ACLOCAL
$AUTOCONF
$AUTOMAKE
diff --git a/t/remake-renamed-m4-macro-and-file.sh b/t/remake-renamed-m4-macro-and-file.sh
index 965873709..985f5c67a 100755
--- a/t/remake-renamed-m4-macro-and-file.sh
+++ b/t/remake-renamed-m4-macro-and-file.sh
@@ -21,12 +21,12 @@
. test-init.sh
cat >> configure.ac <<'END'
+AC_CONFIG_MACRO_DIR([m4])
MY_MACRO
AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I m4
.PHONY: test
test:
test '$(the_answer)' -eq 42
@@ -42,7 +42,7 @@ cat > m4/foo.m4 <<'END'
AC_DEFUN([FOO_MACRO], [the_answer=42; AC_SUBST([the_answer])])
END
-$ACLOCAL -I m4
+$ACLOCAL
$AUTOCONF
$AUTOMAKE
diff --git a/t/remake-renamed-m4-macro.sh b/t/remake-renamed-m4-macro.sh
index 99ab1db90..0d97a221e 100755
--- a/t/remake-renamed-m4-macro.sh
+++ b/t/remake-renamed-m4-macro.sh
@@ -20,12 +20,12 @@
. test-init.sh
cat >> configure.ac <<'END'
+AC_CONFIG_MACRO_DIR([m4])
MY_MACRO
AC_OUTPUT
END
cat > Makefile.am <<'END'
-ACLOCAL_AMFLAGS = -I m4
.PHONY: test
test:
test '$(the_answer)' -eq 42
@@ -42,7 +42,7 @@ AC_DEFUN([FOO_1], [the_answer=42
AC_SUBST([the_answer])])
END
-$ACLOCAL -I m4
+$ACLOCAL
$AUTOCONF
$AUTOMAKE
--
cgit v1.2.1
From 1c0c0581bb219030092b6760e0289a63b9c3be4f Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 28 Dec 2012 21:40:16 +0100
Subject: tests: a test about warnings in category 'obsolete' was failing
spuriously
* t/warnings-obsolete-default.sh : After our removal of $(INCLUDES)
support, this test has been spuriously failing because it was assuming
that a definition of the INCLUDES make variable only caused a warning
rather than a fatal error. Fix it to use a definition of the newly
obsolescent ACLOCAL_AMFLAGS make variable.
Signed-off-by: Stefano Lattarini
---
t/warnings-obsolete-default.sh | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/t/warnings-obsolete-default.sh b/t/warnings-obsolete-default.sh
index 7fbb1bc34..ac3a27d7e 100755
--- a/t/warnings-obsolete-default.sh
+++ b/t/warnings-obsolete-default.sh
@@ -22,16 +22,11 @@
# We want (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
-echo AC_PROG_CC >> configure.ac
-
-cat > Makefile.am <<'END'
-bin_PROGRAMS = foo
-INCLUDES = -Ibar
-END
+echo ACLOCAL_AMFLAGS = > Makefile.am
$ACLOCAL
AUTOMAKE_fails
-grep '^Makefile\.am:2:.*INCLUDES.*AM_CPPFLAGS' stderr
+grep '^Makefile\.am:1:.*ACLOCAL_AMFLAGS.*deprecated' stderr
# Check that we can override warnings about obsolete stuff.
$AUTOMAKE -Wno-obsolete
--
cgit v1.2.1
From 35da6083f8c3be18b6109a28752fe2f9f14f6c12 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Wed, 19 Dec 2012 18:12:04 +0100
Subject: depcomp: remove support for SGI C/C++ compilers
These compilers are only meant to run on IRIX, and that system has seen
its last release in 2006, and is expected to lose support from SGI in
December 2013:
This change fixes automake bug#12967 and bug#12978.
* lib/depcomp (sgi): Remove this depmode.
* NEWS: Update.
Signed-off-by: Stefano Lattarini
---
NEWS | 8 ++++++++
lib/depcomp | 35 -----------------------------------
2 files changed, 8 insertions(+), 35 deletions(-)
diff --git a/NEWS b/NEWS
index 2d6304305..8ac6612c1 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,14 @@ New in 1.14:
'ACLOCAL_AMFLAGS' has proved to be a bad idea anyway -- see automake
bug#9037.
+* Removed support for obsolete platforms:
+
+ - Support for the SGI C/C++ compilers has been removed: these compilers
+ are only meant to run on IRIX, and that system has seen its last
+ release in 2006, and is expected to lose support from SGI in December
+ 2013; see
+ for more information.
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.13:
diff --git a/lib/depcomp b/lib/depcomp
index 3f02f5d00..ab7cc70cd 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -251,41 +251,6 @@ hp)
exit 1
;;
-sgi)
- if test "$libtool" = yes; then
- "$@" "-Wp,-MDupdate,$tmpdepfile"
- else
- "$@" -MDupdate "$tmpdepfile"
- fi
- stat=$?
- if test $stat -ne 0; then
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
-
- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
- echo "$object : \\" > "$depfile"
- # Clip off the initial element (the dependent). Don't try to be
- # clever and replace this with sed code, as IRIX sed won't handle
- # lines with more than a fixed number of characters (4096 in
- # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like '#:fec' to the end of the
- # dependency line.
- tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
- | tr "$nl" ' ' >> "$depfile"
- echo >> "$depfile"
- # The second pass generates a dummy entry for each header file.
- tr ' ' "$nl" < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> "$depfile"
- else
- make_dummy_depfile
- fi
- rm -f "$tmpdepfile"
- ;;
-
xlc)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
--
cgit v1.2.1
From ad08bbfa4f9949e7e7987d280779f3edc0e0a2cb Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Tue, 29 May 2012 19:51:22 +0200
Subject: Drop support for DJGPP, MS-DOS, Windows 95/98/ME
Basically a backport and squash-in of three Automake-NG commits:
v1.12.1-447-g041fe15, v1.12-343-g4526363, v1.12-341-gc853c20,
plus proper simplifications of the ylwrap script.
See also:
* automake.in (BEGIN): Don't override $ENV{SHELL} for DJGPP.
(handle_libtool): Do not bother cleaning '_libs' directories, they
are only used by Libtool on MS-DOS (and we no longer support that
setup).
* syntax-checks.mk (automake_diff_no): Adjust, as now there are only
seven (not eight) different lines between 'automake.in' and 'automake'.
* bootstrap.sh: Don't special case the default value for BOOTSTRAP_SHELL
on DJGPP. While we are at, allow that variable to be overridden from
the environment. Also, adjust comments: we don't use "ln -s" not because
it's not properly supported by DJGPP, but because it might not be
properly supported by MinGW/MSYS.
* configure.ac (MODIFICATION_DELAY): Define to '2' unconditionally, as
we no longer have to cater to quirks of Windows 95/98/ME.
* lib/am/texibuild.am: Remove support for '*.iNN' files used on DJGPP.
* lib/am/texinfos.am: Likewise.
* lib/ylwrap: Remove support for DOS-specific filenames for bison
output.
* t/txinfo19.sh: Remove as obsolete.
* t/list-of-tests.mk: Adjust.
* NEWS: Update.
Signed-off-by: Stefano Lattarini
---
NEWS | 10 ++++++++
automake.in | 11 +-------
bootstrap.sh | 15 +++--------
configure.ac | 14 ++++-------
lib/am/texibuild.am | 3 +--
lib/am/texinfos.am | 25 ++++---------------
lib/ylwrap | 17 +------------
syntax-checks.mk | 4 +--
t/list-of-tests.mk | 1 -
t/txinfo19.sh | 72 -----------------------------------------------------
10 files changed, 29 insertions(+), 143 deletions(-)
delete mode 100755 t/txinfo19.sh
diff --git a/NEWS b/NEWS
index bdafaeddd..745ee7be6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+New in 1.14:
+
+* Removed support for obsolete systems:
+
+ - Support for DJGPP on MS-DOS and/or Windows 95/98/ME has been removed.
+ Note that both Cygwin and MSYS/MinGW on modern Windows versions will
+ continue to be fully supported.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
New in 1.13:
* WARNING: Future backward-incompatibilities!
diff --git a/automake.in b/automake.in
index 35aefd329..2ed64fbfe 100644
--- a/automake.in
+++ b/automake.in
@@ -32,15 +32,6 @@ BEGIN
@Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
unless @Automake::perl_libdirs;
unshift @INC, @Automake::perl_libdirs;
-
- # Override SHELL. This is required on DJGPP so that system() uses
- # bash, not COMMAND.COM which doesn't quote arguments properly.
- # Other systems aren't expected to use $SHELL when Automake
- # runs, but it should be safe to drop the "if DJGPP" guard if
- # it turns up other systems need the same thing. After all,
- # if SHELL is used, ./configure's SHELL is always better than
- # the user's SHELL (which may be something like tcsh).
- $ENV{'SHELL'} = '@SHELL@' if exists $ENV{'DJDIR'};
}
use Class::Struct ();
@@ -2463,7 +2454,7 @@ sub handle_libtool
{
my $dir = ($item eq '.') ? '' : "$item/";
# .libs is for Unix, _libs for DOS.
- push (@libtool_rms, "\t-rm -rf ${dir}.libs ${dir}_libs");
+ push (@libtool_rms, "\t-rm -rf ${dir}.libs");
}
check_user_variables 'LIBTOOLFLAGS';
diff --git a/bootstrap.sh b/bootstrap.sh
index 4b12d2d93..b30d3756d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -31,6 +31,8 @@ export AUTOCONF # might be used by aclocal and/or automake
export AUTOM4TE # ditto
: ${PERL=perl}
+BOOTSTRAP_SHELL=${BOOTSTRAP_SHELL-/bin/sh}
+
# Variables to substitute.
VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac`
PACKAGE=automake
@@ -40,15 +42,6 @@ PERL_THREADS=0
# rule of our Makefile.
RELEASE_YEAR=2012
-# Override SHELL. This is required on DJGPP so that Perl's system()
-# uses bash, not COMMAND.COM which doesn't quote arguments properly.
-# It's not used otherwise.
-if test -n "$DJDIR"; then
- BOOTSTRAP_SHELL=/dev/env/DJDIR/bin/bash.exe
-else
- BOOTSTRAP_SHELL=/bin/sh
-fi
-
# Read the rule for calculating APIVERSION and execute it.
apiver_cmd=`sed -ne 's/\[\[/[/g;s/\]\]/]/g;/^APIVERSION=/p' configure.ac`
eval "$apiver_cmd"
@@ -71,8 +64,8 @@ if test -d automake-$APIVERSION; then
find automake-$APIVERSION -exec chmod u+wx '{}' ';'
fi
rm -rf automake-$APIVERSION
-# Can't use "ln -s lib automake-$APIVERSION", that would create a
-# lib.exe stub under DJGPP 2.03.
+# Can't use "ln -s lib automake-$APIVERSION", that might not work
+# properly on MinGW/MSYS.
mkdir automake-$APIVERSION
cp -rf lib/* automake-$APIVERSION
diff --git a/configure.ac b/configure.ac
index f97ec87e5..280727e87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,16 +198,12 @@ result=no
test "x$am_cv_prog_ln" = xln && result=yes
AC_MSG_RESULT([$result])
-# The amount we should wait after modifying files depends on the platform.
-# On Windows '95, '98 and ME, files modifications have 2-seconds
-# granularity and can be up to 3 seconds in the future w.r.t. the
-# system clock. When it is important to ensure one file is older
+# The amount we should wait after modifying files.
+# FIXME: for file systems with sub-second timestamp resolutions, this
+# FIXME: might be just one second (or even less if 'sleep' supports
+# FIXME: non-integer arguments); is it worth pursuing that road?
# than another we wait at least 5 seconds between creations.
-case $build in
- *-pc-msdosdjgpp) MODIFICATION_DELAY=5;;
- *) MODIFICATION_DELAY=2;;
-esac
-AC_SUBST([MODIFICATION_DELAY])
+AC_SUBST([MODIFICATION_DELAY], [2])
## ------------------------------------------- ##
## Test for things needed by the test suite. ##
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 0fe09b1f9..b60a3c95c 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -30,14 +30,13 @@
## 2) If the texinfo file has some minor mistakes which cause makeinfo
## to fail, the info files are not removed. (They are needed by the
## developer while he writes documentation.)
-## *.iNN files are used on DJGPP. See the comments in install-info-am
%AM_V_MAKEINFO%restore=: && backupdir="$(am__leading_dot)am$$$$" && \
?INSRC? am__cwd=`pwd` && $(am__cd) $(srcdir) && \
rm -rf $$backupdir && mkdir $$backupdir && \
## If makeinfo is not installed we must not backup the files so
## 'missing' can do its job and touch $@ if it exists.
if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
- for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
+ for f in $@ $@-[0-9] $@-[0-9][0-9]; do \
if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
done; \
else :; fi && \
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 6d45c950a..c7b794ff7 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -194,18 +194,7 @@ install-info-am: $(INFO_DEPS)
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
esac; \
if test -f $$file; then d=.; else d=$(srcdir); fi; \
-## 8+3 filesystems cannot deal with foo.info-N filenames: they all
-## conflict. DJGPP comes with a tool, DJTAR, that will rename these
-## files to foo.iNN while extracting the archive. DJGPP's makeinfo
-## is patched to grok these filenames. However we have to account
-## for the renaming when installing the info files.
-##
-## If $file == foo.info, then $file_i == foo.i. The reason we use two
-## shell commands instead of one ('s|\.info$$|.i|') is so that a suffix-less
-## 'foo' becomes 'foo.i' too.
- file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
- for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
- $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
+ for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
if test -f $$ifile; then \
echo "$$ifile"; \
else : ; fi; \
@@ -323,11 +312,9 @@ uninstall-info-am:
@list='$(INFO_DEPS)'; \
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
-## DJGPP-style info files. See comment in install-info-am.
- relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
(if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
- echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
- rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
+ echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9]"; \
+ rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9]; \
else :; fi); \
done
@@ -400,10 +387,8 @@ clean-aminfo:
.PHONY maintainer-clean-am: maintainer-clean-aminfo
maintainer-clean-aminfo:
@list='$(INFO_DEPS)'; for i in $$list; do \
-## .iNN files are DJGPP-style info files.
- i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
- echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
- rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
+ echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9]"; \
+ rm -f $$i $$i-[0-9] $$i-[0-9][0-9]; \
done
## Use '-rf', not just '-f'; see comments in 'mostlyclean-aminfo'
## above for details.
diff --git a/lib/ylwrap b/lib/ylwrap
index b5c673d5f..d59f6aa6e 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -1,7 +1,7 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
-scriptversion=2012-12-21.17; # UTC
+scriptversion=2012-12-28.20; # UTC
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
@@ -111,14 +111,6 @@ case "$input" in
esac
input_rx=`get_dirname "$input" | quote_for_sed`
-# Since DOS filename conventions don't allow two dots,
-# the DOS version of Bison writes out y_tab.c instead of y.tab.c
-# and y_tab.h instead of y.tab.h. Test to see if this is the case.
-y_tab_nodot=false
-if test -f y_tab.c || test -f y_tab.h; then
- y_tab_nodot=true
-fi
-
# The parser itself, the first file, is the destination of the .y.c
# rule in the Makefile.
parser=$1
@@ -138,13 +130,6 @@ while test "$#" -ne 0; do
break
fi
from=$1
- # Handle y_tab.c and y_tab.h output by DOS
- if $y_tab_nodot; then
- case $from in
- "y.tab.c") from=y_tab.c;;
- "y.tab.h") from=y_tab.h;;
- esac
- fi
shift
to=$1
shift
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 042e092ef..180176710 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -80,10 +80,10 @@ sc_tabs_in_texi \
sc_at_in_texi
## These check avoids accidental configure substitutions in the source.
-## There are exactly 8 lines that should be modified from automake.in to
+## There are exactly 7 lines that should be modified from automake.in to
## automake, and 9 lines that should be modified from aclocal.in to
## aclocal.
-automake_diff_no = 8
+automake_diff_no = 7
aclocal_diff_no = 9
sc_diff_automake sc_diff_aclocal: sc_diff_% :
@set +e; tmp=$*-diffs.tmp; \
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 4612d3ded..28b520a04 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -1167,7 +1167,6 @@ t/txinfo10.sh \
t/txinfo13.sh \
t/txinfo16.sh \
t/txinfo17.sh \
-t/txinfo19.sh \
t/txinfo20.sh \
t/txinfo21.sh \
t/txinfo22.sh \
diff --git a/t/txinfo19.sh b/t/txinfo19.sh
deleted file mode 100755
index 1fbc79ebc..000000000
--- a/t/txinfo19.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003-2012 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# Test support for DJGPP's .iNN info files.
-
-required=makeinfo
-. test-init.sh
-
-echo AC_OUTPUT >> configure.ac
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = main.texi
-END
-
-cat > main.texi << 'END'
-\input texinfo
-@setfilename main.info
-@settitle main
-@node Top
-Hello walls.
-@bye
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure "--infodir=$(pwd)/_inst"
-$MAKE
-
-# Make sure .iNN files are installed.
-: > main.i1
-: > main.i21
-$MAKE install
-test -f _inst/main.i1
-test -f _inst/main.i21
-
-# They should be uninstalled too.
-$MAKE uninstall
-test ! -e _inst/main.i1
-test ! -e _inst/main.i21
-
-# Make sure rebuild rules erase old .iNN files when they run makeinfo.
-$sleep
-touch main.texi
-test -f main.i1
-test -f main.i21
-$MAKE
-test ! -e main.i1
-test ! -e main.i21
-
-# Finally, we also want them erased by maintainer-clean.
-: > main.i7
-: > main.i39
-$MAKE maintainer-clean
-test ! -e main.i7
-test ! -e main.i39
-
-:
--
cgit v1.2.1
From ff0c7f834207d83cb8a717a6b0250ad794c93e11 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Wed, 30 May 2012 09:25:59 +0200
Subject: general: assume dot-starting file names are supported
Now that we've dropped support for DJGPP, Windows 95/98/ME
and MS-DOS, that should always the case.
This change is basically a backport of Automake-NG commit
'v1.12-342-ge6af355'.
* lib/am/texibuild.am: Just assume we can have directories whose
name starts with a dot, i.e., that '${am__leading_dot}' expands
to '.'.
* automake.in (require_build_directory): Likewise.
* m4/depend.m4 (AM_SET_DEPDIR): Likewise. Now $(DEPDIR) will
be set unconditionally to '.deps'.
* m4/init.m4 (AM_INIT_AUTOMAKE): Don't AC_REQUIRE the m4 macro
'AM_SET_LEADING_DOT' anymore.
* m4/lead-dot.m4: Delete.
* Makefile.am (dist_automake_ac_DATA): Remove it.
* t/subobj11a.sh: Just assume $(DEPDIR) expands to '.deps'.
Signed-off-by: Stefano Lattarini
---
Makefile.am | 1 -
automake.in | 3 +--
lib/am/texibuild.am | 2 +-
m4/depend.m4 | 5 +----
m4/init.m4 | 1 -
m4/lead-dot.m4 | 19 -------------------
t/subobj11a.sh | 10 ++--------
7 files changed, 5 insertions(+), 36 deletions(-)
delete mode 100644 m4/lead-dot.m4
diff --git a/Makefile.am b/Makefile.am
index 0a37d9f7c..7ad0e1fe4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -275,7 +275,6 @@ dist_automake_ac_DATA = \
m4/gcj.m4 \
m4/init.m4 \
m4/install-sh.m4 \
- m4/lead-dot.m4 \
m4/lex.m4 \
m4/lispdir.m4 \
m4/maintainer.m4 \
diff --git a/automake.in b/automake.in
index 2ed64fbfe..6a121952b 100644
--- a/automake.in
+++ b/automake.in
@@ -7723,8 +7723,7 @@ sub require_build_directory ($)
$directory_map{$cdir} = $dirstamp;
# Set a variable for the dirstamp basename.
- define_pretty_variable ('am__dirstamp', TRUE, INTERNAL,
- '$(am__leading_dot)dirstamp');
+ define_pretty_variable ('am__dirstamp', TRUE, INTERNAL, '.dirstamp');
# Directory must be removed by 'make distclean'.
$clean_files{$dirstamp} = DIST_CLEAN;
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index b60a3c95c..09a8765c5 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -30,7 +30,7 @@
## 2) If the texinfo file has some minor mistakes which cause makeinfo
## to fail, the info files are not removed. (They are needed by the
## developer while he writes documentation.)
- %AM_V_MAKEINFO%restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+ %AM_V_MAKEINFO%restore=: && backupdir=.am$$$$ && \
?INSRC? am__cwd=`pwd` && $(am__cd) $(srcdir) && \
rm -rf $$backupdir && mkdir $$backupdir && \
## If makeinfo is not installed we must not backup the files so
diff --git a/m4/depend.m4 b/m4/depend.m4
index cd9306173..0bbe7fa7a 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -160,10 +160,7 @@ AM_CONDITIONAL([am__fastdep$1], [
# -------------
# Choose a directory name for dependency files.
# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
+AC_DEFUN([AM_SET_DEPDIR], [AC_SUBST([DEPDIR], [.deps])])
# AM_DEP_TRACK
diff --git a/m4/init.m4 b/m4/init.m4
index fc0514897..7804c8b5e 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -88,7 +88,6 @@ AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
[_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
[_AM_PROG_TAR([v7])])])
diff --git a/m4/lead-dot.m4 b/m4/lead-dot.m4
deleted file mode 100644
index 633694fdd..000000000
--- a/m4/lead-dot.m4
+++ /dev/null
@@ -1,19 +0,0 @@
-## -*- Autoconf -*-
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
diff --git a/t/subobj11a.sh b/t/subobj11a.sh
index 4bd886303..130b2ae59 100755
--- a/t/subobj11a.sh
+++ b/t/subobj11a.sh
@@ -57,14 +57,8 @@ $AUTOMAKE -a
./configure --enable-dependency-tracking
-depdir=$(sed -n 's/^ *DEPDIR *= *//p' Makefile)
-if test x"$depdir" != x; then
- depdir=src/$depdir
-else
- echo "$me: cannot extract value of DEPDIR from Makefile" >&2
- exit 1
-fi
-
+$MAKE
+depdir=src/.deps
ls -l "$depdir"
test -f "$depdir"/foo.Po
--
cgit v1.2.1
From f72b86a9cde6adca97dff2094b33599b5ba0bf48 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 28 Dec 2012 21:59:33 +0100
Subject: tests: remove stray uses of 'Exit', in favour of simple 'exit'
* t/warnopts.sh: Here. Suggested by the 'sc_tests_exit_not_Exit'
maintainer check.
Signed-off-by: Stefano Lattarini
---
t/warnopts.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/warnopts.sh b/t/warnopts.sh
index b9a538582..a3578a9d5 100755
--- a/t/warnopts.sh
+++ b/t/warnopts.sh
@@ -55,8 +55,8 @@ AUTOMAKE_fails
# sub/Makefile.am:1: warning: 'AUTOMAKE_OPTIONS' cannot have conditional contents
grep '^Makefile.am:.*foo_SOURCES' stderr
grep '^sub/Makefile.am:.*AUTOMAKE_OPTIONS' stderr
-grep '^sub/Makefile.am:.*foo_SOURCES' stderr && Exit 1
-grep '^Makefile.am:.*AUTOMAKE_OPTIONS' stderr && Exit 1
+grep '^sub/Makefile.am:.*foo_SOURCES' stderr && exit 1
+grep '^Makefile.am:.*AUTOMAKE_OPTIONS' stderr && exit 1
# Only three lines of warnings.
test $(grep -v 'warnings are treated as errors' stderr | wc -l) = 3
--
cgit v1.2.1
From 0fa7c9089931e07bb67cafbba47a0bb8c7348b36 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 28 Dec 2012 23:24:21 +0100
Subject: Drop support for $(ACLOCAL_M4_SOURCES), it's obsolete
The $(ACLOCAL_M4_SOURCES) variables has been obsolete by a long time,
and basically unused (since at least commit ab57cf28 of 2003-04-24), so
drop any mention of it.
* automake.in (scan_aclocal_m4): Flatly reject any ACLOCAL_M4_SOURCES
definition with a fatal error, rather than just warning about it.
if any deinifn
$(ACLOCAL_M4_SOURCES). Don't append it to @ac_deps. This makes such
variable always empty, so there's no need to return it. Adjust the
signature of this function accordingly, and ...
(handle_configure): ... update this function accordingly.
* NEWS: Update.
Signed-off-by: Stefano Lattarini
---
NEWS | 4 ++++
automake.in | 19 +++++--------------
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/NEWS b/NEWS
index be3ea37ea..2b64a1e35 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,10 @@ New in 1.14:
* Obsolete and obsolescent features:
+ - Support for the long-obsolete variable $(ACLOCAL_M4_SOURCES) has
+ been removed. It should be safe to simply remove any definition
+ of it you have in your Makefiles.
+
- Support for the long-obsolete $(INCLUDES) variable has been finally
removed, in favour of the modern equivalent $(AM_CPPFLAGS).
diff --git a/automake.in b/automake.in
index f829ad642..0c06401c3 100644
--- a/automake.in
+++ b/automake.in
@@ -3877,21 +3877,13 @@ sub scan_aclocal_m4 ()
$regen_aclocal = $line =~ 'generated automatically by aclocal';
}
- my @ac_deps = ();
-
- if (set_seen ('ACLOCAL_M4_SOURCES'))
- {
- push (@ac_deps, '$(ACLOCAL_M4_SOURCES)');
- msg_var ('obsolete', 'ACLOCAL_M4_SOURCES',
- "'ACLOCAL_M4_SOURCES' is obsolete.\n"
- . "It should be safe to simply remove it");
- }
+ reject_var ('ACLOCAL_M4_SOURCES',
+ "'ACLOCAL_M4_SOURCES' is obsolete; just remove it");
# Note that it might be possible that aclocal.m4 doesn't exist but
# should be auto-generated. This case probably isn't very
# important.
-
- return ($regen_aclocal, @ac_deps);
+ return $regen_aclocal;
}
@@ -4007,10 +3999,9 @@ sub handle_configure ($$$@)
my $colon_infile = ':' . join (':', @inputs);
$colon_infile = '' if $colon_infile eq ":$makefile.in";
my @rewritten = rewrite_inputs_into_dependencies ($makefile, @inputs);
- my ($regen_aclocal_m4, @aclocal_m4_deps) = scan_aclocal_m4;
+ my $regen_aclocal_m4 = scan_aclocal_m4;
define_pretty_variable ('am__aclocal_m4_deps', TRUE, INTERNAL,
- @configure_deps, @aclocal_m4_deps,
- '$(top_srcdir)/' . $configure_ac);
+ @configure_deps, "\$(top_srcdir)/$configure_ac");
my @configuredeps = ('$(am__aclocal_m4_deps)', '$(CONFIGURE_DEPENDENCIES)');
push @configuredeps, '$(ACLOCAL_M4)' if -f 'aclocal.m4';
define_pretty_variable ('am__configure_deps', TRUE, INTERNAL,
--
cgit v1.2.1
From bff57c887dbd57ace4860b8cd83100cfca02f930 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 25 May 2012 17:50:59 +0200
Subject: Drop support for 'configure.in' as the Autoconf input file
The autoconf input should be named 'configure.ac' instead. The use
of 'configure.in' has been deprecated in Autoconf since at least
the 2.13 -> 2.50 transition, and future Autoconf versions (starting
with 2.70 probably) will start to warn about it at runtime. Automake
has been warning about it since the 1.13 release.
This change is basically a backport of commit 'v1.12-325-g927d4cb',
from Automake-NG.
* lib/Automake/Configure_ac.pm (find_configure_ac): Don't look for
'configure.in' if 'configure.ac' is not found.
(require_configure_ac): On failure, don't tell that "'configure.ac'
or 'configure.in' is required", but just that "'configure.ac' is
required".
* automake.in (@common_sometimes): Don't list 'configure.in'.
(scan_autoconf_files): Adjust heading comments.
* NEWS: Update.
* t/help.sh: Adjust.
* t/configure.sh: Remove as obsolete.
* t/list-of-tests.mk: Adjust.
---
NEWS | 4 +++
automake.in | 3 +--
lib/Automake/Configure_ac.pm | 23 +----------------
t/configure.sh | 59 --------------------------------------------
t/list-of-tests.mk | 1 -
5 files changed, 6 insertions(+), 84 deletions(-)
delete mode 100755 t/configure.sh
diff --git a/NEWS b/NEWS
index 2b64a1e35..76546c746 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,10 @@ New in 1.14:
* Obsolete and obsolescent features:
+ - Support for the long-deprecated name 'configure.in' for the Autoconf
+ input file has been removed altogether. Just use the modern name
+ 'configure.ac' instead.
+
- Support for the long-obsolete variable $(ACLOCAL_M4_SOURCES) has
been removed. It should be safe to simply remove any definition
of it you have in your Makefiles.
diff --git a/automake.in b/automake.in
index 0c06401c3..68e933943 100644
--- a/automake.in
+++ b/automake.in
@@ -231,7 +231,7 @@ my @common_files =
# is used for the --help output only.
my @common_sometimes =
qw(aclocal.m4 acconfig.h config.h.top config.h.bot configure
- configure.ac configure.in stamp-vti);
+ configure.ac stamp-vti);
# Standard directories from the GNU Coding Standards, and additional
# pkg* directories from Automake. Stored in a hash for fast member check.
@@ -5390,7 +5390,6 @@ EOF
# &scan_autoconf_files ()
# -----------------------
-# Check whether we use 'configure.ac' or 'configure.in'.
# Scan it (and possibly 'aclocal.m4') for interesting things.
# We must scan aclocal.m4 because there might be AC_SUBSTs and such there.
sub scan_autoconf_files ()
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
index fcaf0f75c..e53913a5c 100644
--- a/lib/Automake/Configure_ac.pm
+++ b/lib/Automake/Configure_ac.pm
@@ -70,28 +70,7 @@ sub find_configure_ac (;@)
{
my ($directory) = @_;
$directory ||= '.';
- my $configure_ac =
- File::Spec->canonpath (File::Spec->catfile ($directory, 'configure.ac'));
- my $configure_in =
- File::Spec->canonpath (File::Spec->catfile ($directory, 'configure.in'));
-
- if (-f $configure_in)
- {
- msg ('obsolete', "autoconf input should be named 'configure.ac'," .
- " not 'configure.in'");
- if (-f $configure_ac)
- {
- msg ('unsupported',
- "'$configure_ac' and '$configure_in' both present.\n"
- . "proceeding with '$configure_ac'");
- return $configure_ac
- }
- else
- {
- return $configure_in;
- }
- }
- return $configure_ac;
+ return File::Spec->canonpath (File::Spec->catfile ($directory, 'configure.ac'));
}
diff --git a/t/configure.sh b/t/configure.sh
deleted file mode 100755
index 1a1bb94ad..000000000
--- a/t/configure.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010-2012 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# Diagnose if the autoconf input is named configure.in.
-# Diagnose if both configure.in and configure.ac are present, prefer
-# configure.ac.
-
-. test-init.sh
-
-cat >configure.ac <configure.in <Makefile.am
-
-$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
-cat stderr >&2
-grep 'configure\.ac.*configure\.in.*both present' stderr
-
-$ACLOCAL -Wno-error 2>stderr || { cat stderr >&2; exit 1; }
-cat stderr >&2
-grep 'configure\.ac.*configure\.in.*both present' stderr
-grep 'proceeding.*configure\.ac' stderr
-
-# Ensure we really proceed with configure.ac.
-AUTOMAKE_fails -Werror
-grep 'configure\.ac.*configure\.in.*both present' stderr
-grep 'proceeding.*configure\.ac' stderr
-
-AUTOMAKE_run -Wno-error
-grep 'configure\.ac.*configure\.in.*both present' stderr
-grep 'proceeding.*configure\.ac' stderr
-
-mv -f configure.ac configure.in
-AUTOMAKE_fails
-grep "autoconf input.*'configure.ac', not 'configure.in'" stderr
-
-:
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index c4e511297..827b0c505 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -315,7 +315,6 @@ t/condinc2.sh \
t/condlib.sh \
t/condman2.sh \
t/condman3.sh \
-t/configure.sh \
t/confdeps.sh \
t/conff.sh \
t/conff2.sh \
--
cgit v1.2.1
From 00d2aff2e1a75045b36ca01194d8e29a44c0814b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 28 Dec 2012 23:59:00 +0100
Subject: maint: reflect removal of 'configure.in' support in comments and
messages
* t/help.sh, syntax-checks.mk, aclocal.in, old/TODO: In these files.
Signed-off-by: Stefano Lattarini
---
aclocal.in | 4 ++--
old/TODO | 4 ++--
syntax-checks.mk | 5 +++--
t/help.sh | 7 +++----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/aclocal.in b/aclocal.in
index 39351ad23..d38ac22a8 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -81,7 +81,7 @@ my @diff_command;
# --dry-run
my $dry_run = 0;
-# configure.ac or configure.in.
+# configure.ac
my $configure_ac;
# Output file name.
@@ -995,7 +995,7 @@ sub usage ($)
print <<'EOF';
Usage: aclocal [OPTION]...
-Generate 'aclocal.m4' by scanning 'configure.ac' or 'configure.in'
+Generate 'aclocal.m4' by scanning 'configure.ac'
Options:
--automake-acdir=DIR directory holding automake-provided m4 files
diff --git a/old/TODO b/old/TODO
index f8e4754df..fcd8a58f6 100644
--- a/old/TODO
+++ b/old/TODO
@@ -233,7 +233,7 @@ characters long.
* Make sure that all the files in the distribution are world-readable.
should be able to determine what is built by looking at rules (and
-configure.in). Then built man pages (eg) could automatically be
+configure.ac). Then built man pages (eg) could automatically be
omitted from the distribution.
Right now, targets generated internally (eg "install") are not
@@ -445,7 +445,7 @@ consider auto-including any file that matches "*.in".
must look at mkid to see how it works (for subdir usage)
[ right now, it doesn't. i don't see a simple fix right now ]
-if configure.in not found, move up a directory and try again? This
+if configure.ac not found, move up a directory and try again? This
could eliminate a common source of problems.
[ this is just a bad idea ]
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 180176710..9d5626e91 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -438,9 +438,10 @@ sc_m4_am_plain_egrep_fgrep:
exit 1; \
fi
-## Prefer 'configure.ac' over the obsolescent 'configure.in' as the name
+## Use 'configure.ac', not the obsolete 'configure.in', as the name
## for configure input files in our testsuite. The latter has been
-## deprecated for several years (at least since autoconf 2.50).
+## deprecated for several years (at least since autoconf 2.50) and
+## support for it will be removed in Automake 1.14.
sc_tests_no_configure_in:
@if grep -E '\bconfigure\\*\.in\b' $(xtests) $(xdefs) \
| grep -Ev '/backcompat.*\.(sh|tap):' \
diff --git a/t/help.sh b/t/help.sh
index 961fcea9b..f27d8b101 100755
--- a/t/help.sh
+++ b/t/help.sh
@@ -14,8 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Make sure --help and --version work, even when no configure.ac nor
-# configure.in is in the current directory.
+# Make sure --help and --version work, even when no configure.ac is in
+# the current directory.
. test-init.sh
@@ -33,8 +33,7 @@ $ACLOCAL --help
$AUTOMAKE --version
$AUTOMAKE --help
-# Sanity checks: aclocal and automake cannot work without configure.ac
-# nor configure.in.
+# Sanity checks: aclocal and automake cannot work without configure.ac.
$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
$FGREP configure.ac stderr
--
cgit v1.2.1
From b4e64211f670b024fceb4e1dee8a1f288001307e Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Sat, 29 Dec 2012 00:03:44 +0100
Subject: tests: remove a botched comment from a test case
* t/backcompat6.sh: Here.
Signed-off-by: Stefano Lattarini
---
t/backcompat6.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/t/backcompat6.sh b/t/backcompat6.sh
index b99321a72..508bdab70 100755
--- a/t/backcompat6.sh
+++ b/t/backcompat6.sh
@@ -15,8 +15,7 @@
# along with this program. If not, see .
# Backward-compatibility test: try to build and distribute a package
-# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT,
-# and 'configure.in' as autconf input file.
+# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT.
# This script can also serve as mild stress-testing for Automake.
# See also the similar test 'backcompat5.test'.
--
cgit v1.2.1
From c1ffbe9e605e3ef5166606c1d28518f33132b644 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Sat, 29 Dec 2012 00:10:14 +0100
Subject: maint: remove last vestiges of 'configure.in' support from the
testsuite
* syntax-checks.mk: Don't whitelist any file in the maintainer
check looking against use of 'configure.in' in the testsuite.
* t/autodist-configure-no-subdir.sh: Remove last references to
'configure.in'.
Signed-off-by: Stefano Lattarini
---
syntax-checks.mk | 7 +------
t/autodist-configure-no-subdir.sh | 10 ++--------
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 9d5626e91..b7fe6311b 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -443,12 +443,7 @@ sc_m4_am_plain_egrep_fgrep:
## deprecated for several years (at least since autoconf 2.50) and
## support for it will be removed in Automake 1.14.
sc_tests_no_configure_in:
- @if grep -E '\bconfigure\\*\.in\b' $(xtests) $(xdefs) \
- | grep -Ev '/backcompat.*\.(sh|tap):' \
- | grep -Ev '/autodist-configure-no-subdir\.sh:' \
- | grep -Ev '/(configure|help)\.sh:' \
- | grep .; \
- then \
+ @if grep -E '\bconfigure\\*\.in\b' $(xtests) $(xdefs); then \
echo "Use 'configure.ac', not 'configure.in', as the name" >&2; \
echo "for configure input files in the test cases above." >&2; \
exit 1; \
diff --git a/t/autodist-configure-no-subdir.sh b/t/autodist-configure-no-subdir.sh
index 8fd325beb..24c66fe18 100755
--- a/t/autodist-configure-no-subdir.sh
+++ b/t/autodist-configure-no-subdir.sh
@@ -14,8 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Check that 'configure', 'configure.ac' and 'configure.in' are *not*
-# automatically distributed when placed in a subdirectory.
+# Check that 'configure' and 'configure.ac' are *not* automatically
+# distributed when placed in a subdirectory.
# Related to automake bug#7819.
. test-init.sh
@@ -32,12 +32,9 @@ sub/configure:
$(dontbuild)
sub/configure.ac:
$(dontbuild)
-sub/configure.in:
- $(dontbuild)
check-local: distdir
ls -l $(distdir)/sub
test ! -f $(distdir)/sub/configure
- test ! -f $(distdir)/sub/configure.in
test ! -f $(distdir)/sub/configure.ac
END
@@ -49,15 +46,12 @@ configure:
$(dontbuild)
configure.ac:
$(dontbuild)
-configure.in:
- $(dontbuild)
check-local:
echo $(DISTFILES) | grep 'configure' && exit 1; :
echo $(DIST_COMMON) | grep 'configure' && exit 1; :
END
: > sub/configure.ac
-: > sub/configure.in
: > sub/configure
$ACLOCAL
--
cgit v1.2.1
From 7626e632ebc2f47a3038b0aaf26b18af81060bfa Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 25 May 2012 17:51:01 +0200
Subject: cleanup: get rid of 'Automake::Configure_ac' module
Now that we unconditionally assume the Autoconf input is named
"configure.ac", it's easier and clearer to inline the checks on
the existence of such a file directly in the automake and
aclocal scripts.
This change is basically a backport of the 'v1.12-327-gee6d72a'
commit from Automake-NG.
* lib/Automake/Variable.pm (Automake::Configure_ac): Drop this import.
($configure_ac): Define to "configure.ac", unconditionally.
* automake.in: Likewise. Also, in main code, check the existence
of 'configure.ac' directly, instead of calling the now-removed
'require_configure_ac' function.
* aclocal.in: Likewise.
Signed-off-by: Stefano Lattarini
---
Makefile.am | 1 -
aclocal.in | 9 ++--
automake.in | 8 ++--
lib/Automake/Configure_ac.pm | 107 -------------------------------------------
lib/Automake/Variable.pm | 7 +--
5 files changed, 10 insertions(+), 122 deletions(-)
delete mode 100644 lib/Automake/Configure_ac.pm
diff --git a/Makefile.am b/Makefile.am
index 7ad0e1fe4..1dc518800 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -182,7 +182,6 @@ dist_perllib_DATA = \
lib/Automake/ChannelDefs.pm \
lib/Automake/Channels.pm \
lib/Automake/Condition.pm \
- lib/Automake/Configure_ac.pm \
lib/Automake/DisjConditions.pm \
lib/Automake/FileUtils.pm \
lib/Automake/General.pm \
diff --git a/aclocal.in b/aclocal.in
index d38ac22a8..0352f5e94 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -36,7 +36,6 @@ use strict;
use Automake::Config;
use Automake::General;
-use Automake::Configure_ac;
use Automake::Channels;
use Automake::ChannelDefs;
use Automake::XFile;
@@ -81,8 +80,9 @@ my @diff_command;
# --dry-run
my $dry_run = 0;
-# configure.ac
-my $configure_ac;
+# Name of the Autoconf input file. We used to support 'configure.in'
+# as well once, that that is long obsolete now.
+my $configure_ac = 'configure.ac';
# Output file name.
my $output_file = 'aclocal.m4';
@@ -1130,7 +1130,8 @@ sub parse_ACLOCAL_PATH ()
parse_WARNINGS; # Parse the WARNINGS environment variable.
parse_arguments;
parse_ACLOCAL_PATH;
-$configure_ac = require_configure_ac;
+
+fatal "$configure_ac is required" unless -f $configure_ac;
# We may have to rerun aclocal if some file have been installed, but
# it should not happen more than once. The reason we must run again
diff --git a/automake.in b/automake.in
index 68e933943..3253f7fc9 100644
--- a/automake.in
+++ b/automake.in
@@ -136,7 +136,6 @@ use Automake::General;
use Automake::XFile;
use Automake::Channels;
use Automake::ChannelDefs;
-use Automake::Configure_ac;
use Automake::FileUtils;
use Automake::Location;
use Automake::Condition qw/TRUE FALSE/;
@@ -303,8 +302,9 @@ my $force_missing = 0;
## Variables filled during files scanning. ##
## ---------------------------------------- ##
-# Name of the configure.ac file.
-my $configure_ac;
+# Name of the Autoconf input file. We used to support 'configure.in'
+# as well once, that that is long obsolete now.
+my $configure_ac = 'configure.ac';
# Files found by scanning configure.ac for LIBOBJS.
my %libsources = ();
@@ -8274,7 +8274,7 @@ parse_WARNINGS;
# Parse command line.
parse_arguments;
-$configure_ac = require_configure_ac;
+fatal "$configure_ac is required" unless -f $configure_ac;
# Do configure.ac scan only once.
scan_autoconf_files;
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
deleted file mode 100644
index e53913a5c..000000000
--- a/lib/Automake/Configure_ac.pm
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright (C) 2003-2012 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-###############################################################
-# The main copy of this file is in Automake's git repository. #
-# Updates should be sent to automake-patches@gnu.org. #
-###############################################################
-
-package Automake::Configure_ac;
-
-use 5.006;
-use strict;
-use Exporter;
-use Automake::Channels;
-use Automake::ChannelDefs;
-
-use vars qw (@ISA @EXPORT);
-
-@ISA = qw (Exporter);
-@EXPORT = qw (&find_configure_ac &require_configure_ac);
-
-=head1 NAME
-
-Automake::Configure_ac - Locate configure.ac or configure.in.
-
-=head1 SYNOPSIS
-
- use Automake::Configure_ac;
-
- # Try to locate configure.in or configure.ac in the current
- # directory. It may be absent. Complain if both files exist.
- my $file_name = find_configure_ac;
-
- # Likewise, but bomb out if the file does not exist.
- my $file_name = require_configure_ac;
-
- # Likewise, but in $dir.
- my $file_name = find_configure_ac ($dir);
- my $file_name = require_configure_ac ($dir);
-
-=over 4
-
-=back
-
-=head2 Functions
-
-=over 4
-
-=item C<$configure_ac = find_configure_ac ([$directory])>
-
-Find a F or F file in C<$directory>,
-defaulting to the current directory. Complain if both files are present.
-Return the name of the file found, or the former if neither is present.
-
-=cut
-
-sub find_configure_ac (;@)
-{
- my ($directory) = @_;
- $directory ||= '.';
- return File::Spec->canonpath (File::Spec->catfile ($directory, 'configure.ac'));
-}
-
-
-=item C<$configure_ac = require_configure_ac ([$directory])>
-
-Like C, but fail if neither is present.
-
-=cut
-
-sub require_configure_ac (;$)
-{
- my $res = find_configure_ac (@_);
- fatal "'configure.ac' is required" unless -f $res;
- return $res
-}
-
-1;
-
-### Setup "GNU" style for perl-mode and cperl-mode.
-## Local Variables:
-## perl-indent-level: 2
-## perl-continued-statement-offset: 2
-## perl-continued-brace-offset: 0
-## perl-brace-offset: 0
-## perl-brace-imaginary-offset: 0
-## perl-label-offset: -2
-## cperl-indent-level: 2
-## cperl-brace-offset: 0
-## cperl-continued-brace-offset: 0
-## cperl-label-offset: -2
-## cperl-extra-newline-before-brace: t
-## cperl-merge-trailing-else: nil
-## cperl-continued-statement-offset: 2
-## End:
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index d4d230fe9..43f1cd111 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -21,7 +21,6 @@ use Carp;
use Automake::Channels;
use Automake::ChannelDefs;
-use Automake::Configure_ac;
use Automake::Item;
use Automake::VarDef;
use Automake::Condition qw (TRUE FALSE);
@@ -193,8 +192,7 @@ my %_ac_macro_for_var =
YACC => 'AC_PROG_YACC',
);
-# The name of the configure.ac file.
-my $configure_ac;
+my $configure_ac = 'configure.ac';
# Variables that can be overridden without complaint from -Woverride
my %_silent_variable_override =
@@ -1133,9 +1131,6 @@ sub require_variables ($$$@)
my $res = 0;
$reason .= ' but ' unless $reason eq '';
- $configure_ac = find_configure_ac
- unless defined $configure_ac;
-
VARIABLE:
foreach my $var (@vars)
{
--
cgit v1.2.1
From 75e8d5ae392cf9caad74d42c35e6a1ef74f8dbc7 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Sat, 29 Dec 2012 00:45:56 +0100
Subject: NEWS: better distinction between obsolete and obsolescent features
Signed-off-by: Stefano Lattarini
---
NEWS | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/NEWS b/NEWS
index 76546c746..faf79fda5 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,16 @@ New in 1.14:
over the same-named automake-provided macro, as defined in file
'/usr/local/share/aclocal-1.14/vala.m4'.
-* Obsolete and obsolescent features:
+* Obsolescent features flagged:
+
+ - Use of the special makefile variable 'ACLOCAL_AMFLAGS' is deprecated.
+ To specify locations of extra m4 files, the 'AC_CONFIG_MACRO_DIR' or
+ 'AC_CONFIG_MACRO_DIRS' (the latter introduced with autoconf 2.70)
+ should be used instead. And use of the '--install' aclocal option in
+ 'ACLOCAL_AMFLAGS' has proved to be a bad idea anyway -- see automake
+ bug#9037.
+
+* Obsolete features removed:
- Support for the long-deprecated name 'configure.in' for the Autoconf
input file has been removed altogether. Just use the modern name
@@ -24,13 +33,6 @@ New in 1.14:
- Support for the long-obsolete $(INCLUDES) variable has been finally
removed, in favour of the modern equivalent $(AM_CPPFLAGS).
- - Use of the special makefile variable 'ACLOCAL_AMFLAGS' is deprecated.
- To specify locations of extra m4 files, the 'AC_CONFIG_MACRO_DIR' or
- 'AC_CONFIG_MACRO_DIRS' (the latter introduced with autoconf 2.70)
- should be used instead. And use of the '--install' aclocal option in
- 'ACLOCAL_AMFLAGS' has proved to be a bad idea anyway -- see automake
- bug#9037.
-
* Removed support for obsolete platforms:
- Support for the SGI C/C++ compilers has been removed: these compilers
--
cgit v1.2.1
From d11e8cb529c3f9b847b03261c5bd6e74122a9eaf Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Sun, 30 Dec 2012 11:40:53 +0100
Subject: NEWS: document removal of AM_PROG_MKDIR_P macro
Signed-off-by: Stefano Lattarini
---
NEWS | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/NEWS b/NEWS
index 7bfaccb3e..ac723af03 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,13 @@ New in 1.14:
* Obsolete features removed:
+ - The long-obsolete (since automake 1.10) AM_PROG_MKDIR m4 macro has
+ been removed. The $(mkdir_p) make variable and the @mkdir_p@
+ substitutionl still remains available for the moment, as aliases
+ of $(MKDIR_P), for better backward compatibility; but you are
+ advised to stop using ASAP, as they might be removed in future
+ Automake versions.
+
- Support for the long-deprecated name 'configure.in' for the Autoconf
input file has been removed altogether. Just use the modern name
'configure.ac' instead.
--
cgit v1.2.1
From d01834bc91bff6773dcd73d70158974c45d9d8e5 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Sun, 30 Dec 2012 11:57:02 +0100
Subject: obsolete: better error message if AM_PROG_MKDIR_P is used
In Automake 1.14, the long-deprecated macro AM_PROG_MKDIR_P will be
removed. Instead of simply dropping the macro definition, which would
cause unclear error messages in aclocal and autoconf:
configure.ac:4: warning: macro 'AM_PROG_MKDIR_P' not found in library
configure.ac:4: error: possibly undefined macro: AM_PROG_MKDIR_P
If this token and others are legitimate, please use m4_pattern_allow.
See the Autoconf documentation.
we re-add an AM_PROG_MKDIR_P definition that simply raises a *clear* error
message when the macro is used.
See also recent similar commits 'v1.13-5-g9c07d89' and 'v1.13-4-g8e921bf'
* t/am-prog-mkdir-p-no-more.sh: New test.
* t/list-of-tests.mk: Add it.
* m4/obsolete-err.m4: Add the new "error-raising" definition for
AM_PROG_MKDIR_P.
Signed-off-by: Stefano Lattarini
---
m4/obsolete-err.m4 | 6 ++++++
t/am-prog-mkdir-p-no-more.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++
t/list-of-tests.mk | 1 +
3 files changed, 51 insertions(+)
create mode 100755 t/am-prog-mkdir-p-no-more.sh
diff --git a/m4/obsolete-err.m4 b/m4/obsolete-err.m4
index 2d7c518b7..39262f62b 100644
--- a/m4/obsolete-err.m4
+++ b/m4/obsolete-err.m4
@@ -18,6 +18,12 @@ AU_DEFUN([AM_PROG_CC_STDC],
Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
but upon 'ac_cv_prog_cc_stdc'.])])
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_FATAL(['$0': this macro is obsolete.
+ You should simply use the 'AC][_PROG_MKDIR_P' macro instead, and
+ use '$(MKDIR_P)' instead of '$(mkdir_p)' in your Makefile.am
+ files.])])
+
AC_DEFUN([AM_C_PROTOTYPES],
[AC_FATAL([automatic de-ANSI-fication support has been removed])])
AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
diff --git a/t/am-prog-mkdir-p-no-more.sh b/t/am-prog-mkdir-p-no-more.sh
new file mode 100755
index 000000000..4a2e6150c
--- /dev/null
+++ b/t/am-prog-mkdir-p-no-more.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2012 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+# Check that any attempt to use the obsolete macro AM_PROG_MKDIR_P
+# elicits clear and explicit fatal errors.
+
+. test-init.sh
+
+geterr ()
+{
+ "$@" -Wnone 2>stderr && { cat stderr >&2; exit 1; }
+ cat stderr >&2
+ grep "^configure\.ac:4:.*'AM_PROG_MKDIR_P'.*obsolete" stderr
+ grep "'AC_PROG_MKDIR_P'.* instead" stderr
+ grep " use '\$(MKDIR_P)' instead of '\$(mkdir_p)'.*Makefile" stderr
+}
+
+$ACLOCAL
+mv aclocal.m4 aclocal.sav
+
+echo AM_PROG_MKDIR_P >> configure.ac
+
+geterr $ACLOCAL
+test ! -f aclocal.m4
+
+cat aclocal.sav "$am_automake_acdir"/obsolete-err.m4 > aclocal.m4
+
+geterr $AUTOCONF
+geterr $AUTOMAKE
+
+:
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 7e62e6af6..cd41e6aca 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -133,6 +133,7 @@ t/aminit-moreargs-deprecation.sh \
t/amassign.sh \
t/am-config-header-no-more.sh \
t/am-prog-cc-stdc-no-more.sh \
+t/am-prog-mkdir-p-no-more.sh \
t/am-macro-not-found.sh \
t/amopt.sh \
t/amopts-location.sh \
--
cgit v1.2.1
From f5508d5e102ee661a48d3b7fc5768f8baa6d4fbd Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Mon, 31 Dec 2012 18:26:02 +0100
Subject: maint: update copyright year for 2013 (in branch master)
* t/includes-no-more.sh: Only here (all other files already touched in maint)
Signed-off-by: Stefano Lattarini
---
t/includes-no-more.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/includes-no-more.sh b/t/includes-no-more.sh
index eceaed6c5..4867ee5a5 100755
--- a/t/includes-no-more.sh
+++ b/t/includes-no-more.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012-2013 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
--
cgit v1.2.1
From 7965844e6ec5722785fd3b01f6ea00ca059c0112 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 4 Jan 2013 18:35:06 +0100
Subject: texi: remove leftover support for DGJPP '.iNN' info files
A follow-up to commit 'v1.13-6-gad08bbf'.
* lib/am/texinfos.am (dist-info): Stop catering to info files
with '.iNN' extension (as in '.i23' or '.i02').
Signed-off-by: Stefano Lattarini
---
lib/am/texinfos.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index a7c1ff29b..9b9292084 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -346,8 +346,7 @@ dist-info: $(INFO_DEPS)
$(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
esac; \
if test -f $$base; then d=.; else d=$(srcdir); fi; \
- base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
- for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
+ for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9]; do \
if test -f $$file; then \
## Strip leading '$$d/'.
relfile=`expr "$$file" : "$$d/\(.*\)"`; \
--
cgit v1.2.1
From cdba479fe5739555ad9ec30e0224f24b2facf548 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 4 Jan 2013 18:12:29 +0100
Subject: texi: no longer support split info files
See automake bug#13351 and bug#12320.
Automake-generated recipes have for a long time supported "split"
info files:
http://www.gnu.org/software/texinfo/manual/texinfo/texinfo.html#Tag-and-Split-Files
When I asked the rationale for this feature:
http://lists.gnu.org/archive/html/texinfo-devel/2012-08/msg00015.html
Karl Berry confirmed that the reason for its existence was indeed
"efficiency, especially memory size":
http://lists.gnu.org/archive/html/texinfo-devel/2012-08/msg00024.html
He also added that "The Elisp manual is one of the largest ones around.
Looks like it would be maybe 3.5mb as one file." Not in any way big by
modern standards.
OTOH, it appears that the use of split info files (at least in the way
they have been handled by Automake-generated rules for a long time) can
cause real problems in some (admittedly quite corner-case) situations:
http://thread.gmane.org/gmane.comp.parsers.bison.bugs/3963
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12320
So we now follow suit with Automake-NG (see commit v1.12.2-901-gdd603e2,
)
and have Automake-generated makefiles pass the '--no-split' option
unconditionally to makeinfo invocations.
This allow some nice simplifications in our Texinfo recipes, and offer
an automatic fix for bug#12320.
Another *very* good aspect of such a change is that it should be 100%
transparent to the Automake users.
* lib/am/texinfos.am: Simplify moderately.
* lib/am/texibuild.am: Simplify greatly the recipe for the creation
of info files.
* t/txinfo-makeinfo-error-no-clobber.sh: Adjust.
* t/txinfo-no-split.sh: New test.
* t/list-of-tests.mk: Add it.
Signed-off-by: Stefano Lattarini
---
lib/am/texibuild.am | 41 +++------------
lib/am/texinfos.am | 37 ++++++--------
t/list-of-tests.mk | 1 +
t/txinfo-makeinfo-error-no-clobber.sh | 7 ---
t/txinfo-no-split.sh | 94 +++++++++++++++++++++++++++++++++++
5 files changed, 119 insertions(+), 61 deletions(-)
create mode 100755 t/txinfo-no-split.sh
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 2e2a6e10f..9f568fba4 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -22,39 +22,14 @@
## should never be dependent upon a non-distributed built file.
## Therefore we ensure that %DIRSTAMP% exists in the rule.
?!INSRC??DIRSTAMP? @test -f %DIRSTAMP% || $(MAKE) $(AM_MAKEFLAGS) %DIRSTAMP%
-## Back up the info files before running makeinfo. This is the cheapest
-## way to ensure that
-## 1) If the texinfo file shrinks (or if you start using --no-split),
-## you'll not be left with some dead info files lying around -- dead
-## files which would end up in the distribution.
-## 2) If the texinfo file has some minor mistakes which cause makeinfo
-## to fail, the info files are not removed. (They are needed by the
-## developer while he writes documentation.)
- %AM_V_MAKEINFO%restore=: && backupdir=.am$$$$ && \
-?INSRC? am__cwd=`pwd` && $(am__cd) $(srcdir) && \
- rm -rf $$backupdir && mkdir $$backupdir && \
-## If makeinfo is not installed we must not backup the files so
-## 'missing' can do its job and touch $@ if it exists.
- if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
- for f in $@ $@-[0-9] $@-[0-9][0-9]; do \
- if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
- done; \
- else :; fi && \
-?INSRC? cd "$$am__cwd"; \
- if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% \
-?!INSRC? -o $@ `test -f '%SOURCE_INFO%' || echo '$(srcdir)/'`%SOURCE_INFO%; \
-?INSRC??!GENERIC_INFO? -o $@ $(srcdir)/%SOURCE_INFO%; \
-?INSRC??GENERIC_INFO? -o $@ $<; \
- then \
- rc=0; \
-?INSRC? $(am__cd) $(srcdir); \
- else \
- rc=$$?; \
-## Beware that backup info files might come from a subdirectory.
-?INSRC? $(am__cd) $(srcdir) && \
- $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
- fi; \
- rm -rf $$backupdir; exit $$rc
+## If the texinfo file has some minor mistakes which cause makeinfo
+## to fail, the info files are not removed.
+ $(AM_V_MAKEINFO)$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+ %MAKEINFOFLAGS% --no-split -o $@-t \
+?!INSRC? `test -f '%SOURCE_INFO%' || echo '$(srcdir)/'`%SOURCE_INFO%
+?INSRC??!GENERIC_INFO? $(srcdir)/%SOURCE_INFO%
+?INSRC??GENERIC_INFO? $<
+ $(AM_V_at)mv -f $@-t $@
INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 9b9292084..a57bb03b1 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -191,12 +191,11 @@ install-info-am: $(INFO_DEPS)
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
esac; \
- if test -f $$file; then d=.; else d=$(srcdir); fi; \
- for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
- if test -f $$ifile; then \
- echo "$$ifile"; \
- else : ; fi; \
- done; \
+ if test -f $$file; then \
+ echo ./$$file; \
+ else \
+ echo $(srcdir)/$$file; \
+ fi; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
@@ -311,8 +310,8 @@ uninstall-info-am:
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
(if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
- echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9]"; \
- rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9]; \
+ echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile"; \
+ rm -f $$relfile; \
else :; fi); \
done
@@ -345,15 +344,14 @@ dist-info: $(INFO_DEPS)
case $$base in \
$(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
esac; \
- if test -f $$base; then d=.; else d=$(srcdir); fi; \
- for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9]; do \
- if test -f $$file; then \
-## Strip leading '$$d/'.
- relfile=`expr "$$file" : "$$d/\(.*\)"`; \
- test -f "$(distdir)/$$relfile" || \
- cp -p $$file "$(distdir)/$$relfile"; \
- else :; fi; \
- done; \
+ if test -f $$base; then \
+ file=./$$base; \
+ else \
+ file=$(srcdir)/$$base; \
+ fi; \
+ if test -f $$file && test ! -f "$(distdir)/$$base"; then \
+ cp -p $$file "$(distdir)/$$base"; \
+ fi; \
done
endif %?LOCAL-TEXIS%
@@ -383,10 +381,7 @@ clean-aminfo:
.PHONY maintainer-clean-am: maintainer-clean-aminfo
maintainer-clean-aminfo:
- @list='$(INFO_DEPS)'; for i in $$list; do \
- echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9]"; \
- rm -f $$i $$i-[0-9] $$i-[0-9][0-9]; \
- done
+ -test -z "$(INFO_DEPS)" || rm -f $(INFO_DEPS)
## Use '-rf', not just '-f'; see comments in 'mostlyclean-aminfo'
## above for details.
?MAINTCLEAN? -test -z "%MAINTCLEAN%" \
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index e8efe4542..a6b379cce 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -1170,6 +1170,7 @@ t/txinfo-no-clutter.sh \
t/txinfo-no-extra-dist.sh \
t/txinfo-no-installinfo.sh \
t/txinfo-no-repeated-targets.sh \
+t/txinfo-no-split.sh \
t/txinfo-other-suffixes.sh \
t/txinfo-override-infodeps.sh \
t/txinfo-override-texinfo-tex.sh \
diff --git a/t/txinfo-makeinfo-error-no-clobber.sh b/t/txinfo-makeinfo-error-no-clobber.sh
index f4b7d01b1..c567e89f0 100755
--- a/t/txinfo-makeinfo-error-no-clobber.sh
+++ b/t/txinfo-makeinfo-error-no-clobber.sh
@@ -45,10 +45,6 @@ $AUTOCONF
./configure
$MAKE
-# Feign more info files.
-: > main.info-1
-: > sub/main.info-1
-
# Break main.texi.
$sleep
cp main.texi main.old
@@ -64,15 +60,12 @@ END
# makeinfo will bail out, but we should conserve the old info files.
$MAKE && exit 1
test -f main.info
-test -f main.info-1
# Restore main.texi, and break sub/main.texi.
cp main.texi sub/main.texi
mv main.old main.texi
$MAKE && exit 1
test -f main.info
-test ! -e main.info-1
test -f sub/main.info
-test -f sub/main.info-1
:
diff --git a/t/txinfo-no-split.sh b/t/txinfo-no-split.sh
new file mode 100755
index 000000000..aecf7e735
--- /dev/null
+++ b/t/txinfo-no-split.sh
@@ -0,0 +1,94 @@
+#! /bin/sh
+# Copyright (C) 2013 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+# Info split files should not be produced (automake bug#13351).
+
+required=makeinfo
+. test-init.sh
+
+echo AC_OUTPUT >> configure.ac
+
+cat > Makefile.am <<'END'
+MAKEINFO = makeinfo --split-size 10
+info_TEXINFOS = foo.texi
+
+test-split: # A sanity check.
+ $(MAKEINFO) -o split.info foo.texi
+
+check-local:
+ test -f $(srcdir)/foo.info
+ test ! -f $(srcdir)/foo.info-1
+ test "`find $(srcdir) . | grep '\.info'`" = "$(srcdir)/foo.info"
+END
+
+cat > foo.texi << 'END'
+\input texinfo
+@setfilename foo.info
+@settitle foo
+@dircategory Dummy utilities
+@direntry
+* Foo: (foo). Does nothing at all.
+@end direntry
+
+@node Top
+@top Foo
+
+@menu
+* Intro:: Introduction
+* Planets:: List of Planets
+@end menu
+
+@node Intro
+@chapter Introduction
+Will list planets.
+
+@node Planets
+@chapter List of planets
+Hello Mercury.
+Hello Venus
+Hello Earth
+Hello Mars.
+Hello Jupiter.
+Hello Saturn.
+Hello Uran.
+Hello Neptune.
+Hello Pluto.
+@bye
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE test-split
+ls -l # For debugging.
+test -f split.info
+test -f split.info-1
+test -f split.info-2
+rm -f split*
+
+$MAKE
+
+ls -l # For debugging.
+test -f foo.info
+test ! -f foo.info-1
+test "$(find . | $FGREP '.info' | sed 's|^\./||')" = foo.info
+
+$MAKE distcheck
+
+:
--
cgit v1.2.1
From 030ecb45f60d9504155cf0778f9a93c746a5088b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Mon, 14 Jan 2013 20:43:24 +0100
Subject: compat: restore AM_PROG_MKDIR, again
OK, this is getting ridiculous, but we cannot remove this macro yet
(and, yes, the fault for this mess lies entirely on me; let's not
dwell on that, thank you very much).
Gettext (so far the greatest "offender" in the use of AM_PROG_MKDIR), in
its latest release 0.18.2, has removed all the uses of that macro still
present in its code base. So I thought we could finally and safely
remove it. Wrong. If a package's 'configure.ac' contains a call like:
AM_GNU_GETTEXT_VERSION([0.18])
then the 'autopoint' script will bring the data files from the Gettext
release *1.18* into the package's tree -- yes, even even if the developer
has installed *and is using* Gettext 1.18.2! Now, these data files
comprise m4 files (that will be seen by subsequent aclocal and autoconf
calls), and of course, the pre-0.18.2 version of some of these files
still contains occurrences of AM_PROG_MKDIR_P -- so Automake 1.13 errors
out, and we lose. This has already happened in practice:
Moreover, while we might see it as not unreasonable to ask a developer
using Automake 1.14 to also update Gettext to 1.18.2, that would not
be enough; in order for gettext to use the correct data files, our
developer would have to update his configure.ac to read:
AM_GNU_GETTEXT_VERSION([0.18.2])
thus requiring *all* of his co-developers to install Gettext 1.18.2,
even if they are still using, say, Automake 1.13. Bad.
So we re-instate this macro as a simple alias for AC_PROG_MKDIR (plus
a non-fatal runtime warning in the 'obsolete' category), and drop any
plan to remove it (see how much good those plans have done us so far).
Note that NEWS is not yet adjusted, since we'll have to adjust it in
maint before (to minimize spurious merge conflicts).
* doc/automake.texi: Update.
* PLANS/obsolete-removed/am-prog-mkdir-p.txt: Likewise.
* t/gettext-macros.sh: Adjust.
* t/am-prog-mkdir-p.sh: New test.
* t/mkdir_p.sh: Remove, folded into the new one.
* t/am-prog-mkdir-p-no-more: Remove as superseded.
* t/list-of-tests.mk: Adjust.
* t/obsolete-err.m4: Re-instate AM_PROG_MKDIR_P as a working
alias for AC_PROG_MKDIR_P (albeit giving runtime warnings, and
calling AC_SUBST on 'mkdir_p' too).
* m4/init.m4 (AM_INIT_AUTOMAKE): No longer call AC_SUBST for
'mkdir_p', as that is once again AM_PROG_MKDIR_P's business.
Signed-off-by: Stefano Lattarini
---
PLANS/obsolete-removed/am-prog-mkdir-p.txt | 72 +++---------------------------
doc/automake.texi | 27 +++++++++--
m4/init.m4 | 5 ---
m4/obsolete-err.m4 | 18 ++++----
t/am-prog-mkdir-p-no-more.sh | 44 ------------------
t/am-prog-mkdir-p.sh | 70 +++++++++++++++++++++++++++++
t/gettext-macros.sh | 13 +++---
t/list-of-tests.mk | 3 +-
t/mkdir_p.sh | 55 -----------------------
9 files changed, 118 insertions(+), 189 deletions(-)
delete mode 100755 t/am-prog-mkdir-p-no-more.sh
create mode 100755 t/am-prog-mkdir-p.sh
delete mode 100755 t/mkdir_p.sh
diff --git a/PLANS/obsolete-removed/am-prog-mkdir-p.txt b/PLANS/obsolete-removed/am-prog-mkdir-p.txt
index b096ecece..4143fac85 100644
--- a/PLANS/obsolete-removed/am-prog-mkdir-p.txt
+++ b/PLANS/obsolete-removed/am-prog-mkdir-p.txt
@@ -1,67 +1,9 @@
-In Automake 1.13.x
-------------------
+We have dropped any plan to remove the obsolescent macro AM_PROG_MKDIR_P,
+(today just an alias for the Autoconf-provided macro AC_PROG_MKDIR_P), as
+well as the related $(mkdir_p) make variable and the @mkdir_p@ configure
+substitution.
-We had already scheduled the removal of the long-deprecated AM_PROG_MKDR_P
-macro (superseded by the autoconf-provided one AC_PROG_MKDIR_P) for
-Automake 1.13 -- see commit 'v1.12-20-g8a1c64f'.
+That planned removal has already proven source of countless headaches and
+backward-compatibility issues, which vastly outweigh any "clean-up benefit"
+we would get from the removal of that obsolescent but unobtrusive cruft.
-Alas, it turned out the latest Gettext version at the time (0.18.1.1) was
-still using that macro:
-
-
-
-And since the maintenance of Gettext was stalled, we couldn't get a fix
-committed and released in time for the appearance of automake 1.13:
-
-
-
-
-
-So, on a strong advice by Jim Meyering, in commit 'v1.12.4-158-gdf23daf'
-we re-introduced AM_PROG_MKDIR_P in Automake. That has been an
-unfortunate necessity (thanks to Jim for having convinced me of that in
-time!)
-
-
-For Automake 1.14
------------------
-
-Finally, AM_PROG_MKDR_P we'll be fully obsolete in in Automake 1.14 (see
-commit 'v1.12.4-174-g5a28948', merged in master by 'v1.13-5-gb373ad9'),
-while still offering a clear error message for the moment (see follow-up
-commit 'v1.13-30-gd01834b').
-
-We can finally do so because Gettext has got a maintainer in the meantime,
-and a new release has been made that no longer uses AM_PROG_MKDIR_P:
-
-
-
-We still keep the obsolete '@mkdir_p@' substitution and '$(mkdir_p)'
-variable around though, since they are still used by 'Makefile.in.in'
-template from gettext:
-
- $ cd ~/src/gettext
- $ git checkout master
- $ git describe
- v0.18.2-4-g3188bbf
- $ grep mkdir_p gettext-runtime/po/Makefile.in.in | grep -v '^#'
- mkdir_p = @mkdir_p@
- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
- $(mkdir_p) $(DESTDIR)$$dir; \
- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
- $(mkdir_p) $(DESTDIR)$$dir; \
-
-(see also Automake commit v1.12.1-112-g2551021).
-
-More to the point, it's almost impossible to diagnose usages of those
-macro and substitution using the existing Automake parsing and warning
-infrastructure; it's much easier to just keep them around for a while.
-
-
-The future
-----------
-
-We want to finally remove '@mkdir_p@' and '$(mkdir_p)' as well some
-day. It would be nice if we could do so with some kind of deprecation,
-but that is not worth too much work. Anyway, no hurry an no high
-priority for this removal.
diff --git a/doc/automake.texi b/doc/automake.texi
index 6ec14b09c..5eaa27739 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -4050,10 +4050,10 @@ define @code{WITH_DMALLOC} and add @option{-ldmalloc} to @code{LIBS}.
@cindex obsolete macros
Although using some of the following macros was required in past
-releases, you should not use any of them in new code. Also, all
-these macros will be @emph{removed in some future Automake version},
-so you should consider updating your @file{configure.ac} to avoid
-problems in the future.
+releases, you should not use any of them in new code. Also, most
+of these macros will probably be @emph{removed in some future Automake
+version}, so you should consider updating your @file{configure.ac}
+to avoid problems in the future.
@table @code
@@ -4064,6 +4064,25 @@ This is an @emph{obsolete wrapper} around @code{AC_PROG_CC_C_O}. New
code needs not to use this macro. It will be deprecated, and then
removed, in future Automake versions.
+@item AM_PROG_MKDIR_P
+@acindex AM_PROG_MKDIR_P
+@cindex @code{mkdir -p}, macro check
+@vindex MKDIR_P
+@vindex mkdir_p
+
+From Automake 1.8 to 1.9.6 this macro used to define the output
+variable @code{mkdir_p} to one of @code{mkdir -p}, @code{install-sh
+-d}, or @code{mkinstalldirs}.
+
+Nowadays Autoconf provides a similar functionality with
+@code{AC_PROG_MKDIR_P} (@pxref{Particular Programs, , Particular
+Program Checks, autoconf, The Autoconf Manual}), however this defines
+the output variable @code{MKDIR_P} instead. In case you are still
+using the @code{AM_PROG_MKDIR_P} macro in your @file{configure.ac},
+or its provided variable @code{$(mkdir_p)} in your @file{Makefile.am},
+you are advised to switch ASAP to the more modern Autoconf-provided
+interface instead.
+
@end table
@node Private Macros
diff --git a/m4/init.m4 b/m4/init.m4
index 6857c4410..d7d401356 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -79,11 +79,6 @@ AM_MISSING_PROG([MAKEINFO], [makeinfo])
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility. To be removed once Automake 1.9.x
-# dies out for good. For more background, see:
-#
-#
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
diff --git a/m4/obsolete-err.m4 b/m4/obsolete-err.m4
index a94a651bd..1ba6df354 100644
--- a/m4/obsolete-err.m4
+++ b/m4/obsolete-err.m4
@@ -1,6 +1,5 @@
# -*- Autoconf -*-
-# Obsolete and "removed" macros, that must however still report explicit
-# error messages when used, to smooth transition.
+# Deprecated, obsolescent or and obsolete macros.
#
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
@@ -8,6 +7,14 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])dnl
+AC_DIAGNOSE([obsolete],
+[macro '$0' is deprecated.
+You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
+and use '$(MKDIR_P)' instead of '$(mkdir_p)' in your Makefile.am files.])])
+
dnl TODO: Remove in Automake 1.15.
AC_DEFUN([AM_CONFIG_HEADER],
[AC_FATAL(['$0': this macro is obsolete.
@@ -20,13 +27,6 @@ AC_DEFUN([AM_PROG_CC_STDC],
Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
but upon 'ac_cv_prog_cc_stdc'.])])
-dnl TODO: Remove in Automake 1.16.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_FATAL(['$0': this macro is obsolete.
- You should simply use the 'AC][_PROG_MKDIR_P' macro instead, and
- use '$(MKDIR_P)' instead of '$(mkdir_p)' in your Makefile.am
- files.])])
-
dnl TODO: Remove in Automake 1.14.
AC_DEFUN([AM_C_PROTOTYPES],
[AC_FATAL([automatic de-ANSI-fication support has been removed])])
diff --git a/t/am-prog-mkdir-p-no-more.sh b/t/am-prog-mkdir-p-no-more.sh
deleted file mode 100755
index 78a3ef9bc..000000000
--- a/t/am-prog-mkdir-p-no-more.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012-2013 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# Check that any attempt to use the obsolete macro AM_PROG_MKDIR_P
-# elicits clear and explicit fatal errors.
-
-. test-init.sh
-
-geterr ()
-{
- "$@" -Wnone 2>stderr && { cat stderr >&2; exit 1; }
- cat stderr >&2
- grep "^configure\.ac:4:.*'AM_PROG_MKDIR_P'.*obsolete" stderr
- grep "'AC_PROG_MKDIR_P'.* instead" stderr
- grep " use '\$(MKDIR_P)' instead of '\$(mkdir_p)'.*Makefile" stderr
-}
-
-$ACLOCAL
-mv aclocal.m4 aclocal.sav
-
-echo AM_PROG_MKDIR_P >> configure.ac
-
-geterr $ACLOCAL
-test ! -f aclocal.m4
-
-cat aclocal.sav "$am_automake_acdir"/obsolete-err.m4 > aclocal.m4
-
-geterr $AUTOCONF
-geterr $AUTOMAKE
-
-:
diff --git a/t/am-prog-mkdir-p.sh b/t/am-prog-mkdir-p.sh
new file mode 100755
index 000000000..ad5a810f8
--- /dev/null
+++ b/t/am-prog-mkdir-p.sh
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2012-2013 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+# Check that the AM_PROG_MKDIR_P macro is deprecated, but still works.
+# We should should also still define $(mkdir_p), for backward
+# compatibility.
+
+. test-init.sh
+
+cat >> configure.ac <<'END'
+AC_CONFIG_FILES([sub/Makefile])
+AM_PROG_MKDIR_P
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+all-local:
+ $(MKDIR_P) . dir1/a
+ $(mkdir_p) . dir2/b
+ @MKDIR_P@ . dir3/c
+ @mkdir_p@ . dir4/d
+check-local: all
+ test -d dir1/a
+ test -d dir2/b
+ test -d dir3/c
+ test -d dir4/d
+ test -d dir5/e
+ test -d dir5/f
+ test -d dir5/g
+END
+
+mkdir sub
+cat > sub/Makefile.am << 'END'
+# Even '$(mkdir_p)' should continue to work also in subdir makefiles.
+all-local:
+ $(MKDIR_P) .. ../dir5/d
+ $(mkdir_p) .. ../dir5/e
+ @MKDIR_P@ .. ../dir5/f
+ @mkdir_p@ .. ../dir5/g
+END
+
+$ACLOCAL
+$AUTOCONF -Wnone -Wobsolete -Werror 2>stderr && { cat stderr >&2; exit 1; }
+cat stderr >&2
+grep "^configure\\.ac:5:.*'AM_PROG_MKDIR_P'.*deprecated" stderr
+grep "[Aa]utoconf-provided 'AC_PROG_MKDIR_P'.* instead" stderr
+grep "'\$(MKDIR_P)' instead of '\$(mkdir_p)'" stderr
+
+$AUTOCONF -Wno-obsolete
+$AUTOMAKE
+
+./configure
+$MAKE check-local
+$MAKE distcheck
+
+:
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
index 67839b4ba..5a9324012 100755
--- a/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
@@ -62,7 +62,10 @@ AM_GNU_GETTEXT
AM_GNU_GETTEXT_VERSION([$autopoint_version])
END
-if ! ($am_gettextize_command --force && test -f m4/gettext.m4); then
+if $am_gettextize_command --force && test -f m4/gettext.m4; then
+ echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh
+ echo "export ACLOCAL_PATH" >> get.sh
+else
# Older versions of gettext might not have a gettextize program
# available, but this doesn't mean the user hasn't made the gettext
# macros available, e.g., by properly setting ACLOCAL_PATH.
@@ -76,12 +79,12 @@ if ! ($am_gettextize_command --force && test -f m4/gettext.m4); then
fi
fi
-echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh
-echo "export ACLOCAL_PATH" >> get.sh
-
+cat >> get.sh <<'END'
# Even recent versions of gettext used the now-obsolete 'AM_PROG_MKDIR_P'
# m4 macro. So we need the following to avoid spurious errors.
-echo 'AC_DEFUN([AM_PROG_MKDIR_P], [AC_PROG_MKDIR_P([$@])])' >> m4/mk-dirp.m4
+ACLOCAL="$ACLOCAL -Wno-obsolete"
+AUTOMAKE="$AUTOMAKE -Wno-obsolete"
+END
. ./get.sh
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index d2b687689..1996de671 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -133,7 +133,7 @@ t/amassign.sh \
t/am-config-header-no-more.sh \
t/am-prog-cc-c-o.sh \
t/am-prog-cc-stdc-no-more.sh \
-t/am-prog-mkdir-p-no-more.sh \
+t/am-prog-mkdir-p.sh \
t/am-macro-not-found.sh \
t/amopt.sh \
t/amopts-location.sh \
@@ -686,7 +686,6 @@ t/missing-version-mismatch.sh \
t/missing3.sh \
t/am-missing-prog.sh \
t/missing-auxfile-stops-makefiles-creation.sh \
-t/mkdir_p.sh \
t/mkinstall.sh \
t/mkinst2.sh \
t/mkinst3.sh \
diff --git a/t/mkdir_p.sh b/t/mkdir_p.sh
deleted file mode 100755
index 2e834239a..000000000
--- a/t/mkdir_p.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012-2013 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# AM_INIT_AUTOMAKE should still define $(mkdir_p), for backward
-# compatibility.
-
-. test-init.sh
-
-cat >> configure.ac << 'END'
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-SUBDIRS = sub
-all-local:
- $(mkdir_p) . dir1/a
- @mkdir_p@ . dir2/b
-check-local: all
- test -d dir1/a
- test -d dir2/b
- test -d dir3/c
- test -d dir3/d
-END
-
-mkdir sub
-cat > sub/Makefile.am << 'END'
-# '$(mkdir_p)' should continue to work even in subdir makefiles.
-all-local:
- $(mkdir_p) .. ../dir3/c
- @mkdir_p@ .. ../dir3/d
-END
-
-$ACLOCAL
-$AUTOCONF -Werror -Wall
-$AUTOMAKE
-
-./configure
-$MAKE check-local
-$MAKE distcheck
-
-:
--
cgit v1.2.1
From b49ebac3b84cf27c5398cad9db0ae0c000532135 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 18 Jan 2013 11:24:38 +0100
Subject: NEWS (master): we are not going to remove AM_PROG_MKDIR_P in 1.14
See commit v1.13.1-109-g030ecb4 of 2013-01-16, "compat: restore
AM_PROG_MKDIR, again", for the rationale.
Signed-off-by: Stefano Lattarini
---
NEWS | 7 -------
1 file changed, 7 deletions(-)
diff --git a/NEWS b/NEWS
index d24771dbd..26b789819 100644
--- a/NEWS
+++ b/NEWS
@@ -22,13 +22,6 @@ New in 1.14:
* Obsolete features removed:
- - The long-obsolete (since automake 1.10) AM_PROG_MKDIR m4 macro has
- been removed. The $(mkdir_p) make variable and the @mkdir_p@
- substitutionl still remains available for the moment, as aliases
- of $(MKDIR_P), for better backward compatibility; but you are
- advised to stop using ASAP, as they might be removed in future
- Automake versions.
-
- Support for the long-deprecated name 'configure.in' for the Autoconf
input file has been removed altogether. Just use the modern name
'configure.ac' instead.
--
cgit v1.2.1
From 1dc3dac2df7ca11c795bd0d8dac0a4567d2a2fed Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Wed, 23 Jan 2013 12:00:04 +0100
Subject: coverage: split info files are not installed nor distributed
See automake bugs #12320 and #13351.
* t/txinfo-no-extra-dist.sh: Enhance.
Signed-off-by: Stefano Lattarini
---
t/txinfo-no-extra-dist.sh | 62 +++++++++++++++++++++++++++++++++++------------
1 file changed, 47 insertions(+), 15 deletions(-)
diff --git a/t/txinfo-no-extra-dist.sh b/t/txinfo-no-extra-dist.sh
index aa7bec22c..245d3e02b 100755
--- a/t/txinfo-no-extra-dist.sh
+++ b/t/txinfo-no-extra-dist.sh
@@ -15,7 +15,10 @@
# along with this program. If not, see .
# Test to ensure that a ".info~" or ".info.bak" file doesn't end up
-# in the distribution. Bug report from Greg McGary.
+# in the distribution or the installation. Bug report from Greg McGary.
+# Also make sure that "split" info files (today no longer supported,
+# see automake bug#13351) are not distributed nor installed. See
+# automake bug#12320.
. test-init.sh
@@ -25,14 +28,33 @@ END
cat > Makefile.am << 'END'
info_TEXINFOS = textutils.texi subdir/main.texi
-test: distdir
+
+test-dist: distdir
+ test -f $(distdir)/textutils.info
+ test -f $(distdir)/subdir/main.info
@echo DISTFILES = $(DISTFILES)
- @case '$(DISTFILES)' in *'~'*|*'.bak'*) exit 1;; *) exit 0;; esac
- st=0; \
+ @case '$(DISTFILES)' in \
+ *'~'*|*'.bak'*|*'.info-'*|*.i[0-9]*) exit 1;; \
+ *) exit 0;; \
+ esac
+ @st=0; \
find $(distdir) | grep '~' && st=1; \
find $(distdir) | grep '\.bak' && st=1; \
+ find $(distdir) | grep '\.info-' && st=1; \
+ find $(distdir) | grep '\.i[0-9]' && st=1; \
+ exit $$st
+
+test-inst: install
+ test -f '$(infodir)/textutils.info'
+ test -f '$(infodir)/main.info'
+ @st=0; \
+ find '$(prefix)' | grep '~' && st=1; \
+ find '$(prefix)' | grep '\.bak' && st=1; \
+ find '$(prefix)' | grep '\.info-' && st=1; \
+ find '$(prefix)' | grep '\.i[0-9]' && st=1; \
exit $$st
-PHONY: test
+
+PHONY: test-dist test-inst
END
: > texinfo.tex
@@ -44,16 +66,26 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE
-./configure
-: > textutils.info
-: > subdir/main.info
-: > textutils.info~
-: > textutils.info.bak
-: > subdir/main.info~
-: > subdir/main.info.bak
-$MAKE test
+./configure --prefix="$(pwd)/_inst"
+info_suffixes='info info-0 info-1 info-2 i00 i01 i23 info.bak info~'
+for suf in $info_suffixes; do
+ for base in textutils subdir/main; do
+ : > $base.$suf
+ done
+done
+ls -l . subdir # For debugging.
+$MAKE test-dist
+$MAKE test-inst
$MAKE maintainer-clean
-test -f subdir/main.info~
-test -f subdir/main.info.bak
+
+for suf in $info_suffixes; do
+ for base in textutils subdir/main; do
+ if test "$suf" = info; then
+ test ! -e $base.$suf
+ else
+ test -f $base.$suf
+ fi
+ done
+done
:
--
cgit v1.2.1
From b9384c4a1b1340aba53b979c7840bb6a1d3e70b2 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Mon, 28 Jan 2013 13:41:55 +0100
Subject: NEWS: IRIX is still supported; only SGI depmode no longer is
This change is for the master branch (see the similar commit
'v1.13.1b-3-g97f04a5' on the maint branch).
The only IRIX-specific support that is actually removed in master (and
thus in the next major Automake version) is the depcomp support for the
SGI compiler. That means that automatic dependency tracking will no
longer work with that compiler, but "normal" compilation should still
work, at least until the compiler is supported by Autoconf.
So there is no point in alarming our users by stating in the NEWS file
that "support for IRIX and the SGI compilers has been removed"; after
all, while we don't test on nor particularly care about IRIX anymore,
that doesn't mean we are deliberately breaking it, and the likelihood
of an intended breakage there is very low.
See:
* NEWS: Adjust. Improve explanation of our rationale for dropping
support for the SGI compilers.
Suggested-by: Peter Rosin
Signed-off-by: Stefano Lattarini
---
NEWS | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/NEWS b/NEWS
index c96266b01..de85f9481 100644
--- a/NEWS
+++ b/NEWS
@@ -35,11 +35,13 @@ New in 1.14:
* Removed support for obsolete platforms:
- - Support for the SGI C/C++ compilers has been removed: these compilers
- are only meant to run on IRIX, and that system has seen its last
- release in 2006, and is expected to lose support from SGI in December
- 2013; see
- for more information.
+ - Support for automatic dependency tracking with the SGI C/C++ compilers
+ on IRIX has been removed. The SGI depmode had been reported broken
+ "in the wild" already, and we don't think investing time in debugging
+ and fixing it would have been worthwhile, especially considering that
+ SGI has last updated those compilers in 2006, and is expected to retire
+ support for them in December 2013:
+
- Support for DJGPP on MS-DOS and/or Windows 95/98/ME has been removed.
Note that both Cygwin and MSYS/MinGW on modern Windows versions will
--
cgit v1.2.1
From a2ea514b1140d25dd2397ff48ff990a95b7f5e6b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 19 Apr 2013 16:01:12 +0200
Subject: NEWS (master): reflect new Automake versioning scheme
The next minor Automake version will be 1.14 (not 1.13.2 -- that will
be the next bug-fixing version). And the next major Automake version
will be 2.0.
Signed-off-by: Stefano Lattarini
---
NEWS | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index 495648f77..6f163800a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.14:
+New in 2.0:
* Aclocal search path:
@@ -131,7 +131,7 @@ New in 1.14:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-New in 1.13.2:
+New in 1.14:
* C compilation, and the AC_PROG_CC and AM_PROG_CC_C_O macros:
--
cgit v1.2.1
From 57c720096a413b5cb11acd4efb4fbe43a521ffba Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 19 Apr 2013 18:40:49 +0200
Subject: compat: reinstate support for obsolete $(INCLUDES) variable
Since INCLUDES and AM_CPPFLAGS can be both used at the same time in a
single project, and interact in a non-obvious way, switching away from
INCLUDES is, unfortunately, not simply a matter of doing a mindless
INCLUDES -> AM_CPPFLAGS substitution. In fact, the transition from a
"INCLUDES + CPPFLAGS" setup to a "AM_CPPFLAGS only" setup could cause
subtle bugs to sneak into the build systems of the client packages
doing the transition. Forcing this risk upon our users is definitely
not worth the small enhancement in consistency and cleanliness that
the removal of INCLUDES would give us.
For a more extended rationale and related discussions, see:
This change basically reverts commit v1.13-8-g880595d.
* automake.in: Re-introduce support for INCLUDES (its use will cause
warnings in the 'obsolete' category rather than fatal errors).
* doc/automake.texi: Adjust to re-add mention of INCLUDES.
* t/includes-no-more.sh: Rename ...
* t/includes-deprecation.sh: ... like this, and adjust.
* t/list-of-tests.mk: Update.
* t/warnopts.sh: Minor fixlet while at it.
Suggested-by: Peter Rosin
Signed-off-by: Stefano Lattarini
---
NEWS | 3 ---
automake.in | 25 +++++++++++++++----------
doc/automake.texi | 14 ++++++++++----
t/includes-deprecation.sh | 41 +++++++++++++++++++++++++++++++++++++++++
t/includes-no-more.sh | 32 --------------------------------
t/list-of-tests.mk | 2 +-
t/warnopts.sh | 8 ++------
7 files changed, 69 insertions(+), 56 deletions(-)
create mode 100755 t/includes-deprecation.sh
delete mode 100755 t/includes-no-more.sh
diff --git a/NEWS b/NEWS
index 6f163800a..fb70eee87 100644
--- a/NEWS
+++ b/NEWS
@@ -30,9 +30,6 @@ New in 2.0:
been removed. It should be safe to simply remove any definition
of it you have in your Makefiles.
- - Support for the long-obsolete $(INCLUDES) variable has been finally
- removed, in favour of the modern equivalent $(AM_CPPFLAGS).
-
* Removed support for obsolete platforms:
- Support for automatic dependency tracking with the SGI C/C++ compilers
diff --git a/automake.in b/automake.in
index 4275b57ea..0dcf06bef 100644
--- a/automake.in
+++ b/automake.in
@@ -604,6 +604,7 @@ my @cpplike_flags =
qw{
$(DEFS)
$(DEFAULT_INCLUDES)
+ $(INCLUDES)
$(AM_CPPFLAGS)
$(CPPFLAGS)
};
@@ -790,9 +791,9 @@ register_language ('name' => 'asm',
'config_vars' => ['CCAS', 'CCASFLAGS'],
'flags' => ['CCASFLAGS'],
- # Users can set AM_CCASFLAGS to include $(DEFS) or
- # or anything else required. They can also set CCAS.
- # Or simply use Preprocessed Assembler.
+ # Users can set AM_CCASFLAGS to include $(DEFS),
+ # $(INCLUDES), or anything else required. They can also
+ # set CCAS. Or simply use Preprocessed Assembler.
'compile' => '$(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)',
'ccer' => 'CCAS',
'compiler' => 'CCASCOMPILE',
@@ -871,9 +872,9 @@ register_language ('name' => 'ppfc',
# Preprocessed Fortran 77
#
# The current support for preprocessing Fortran 77 just involves
-# passing "$(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)"
-# as additional flags to the Fortran 77 compiler, since this is
-# how GNU Make does it; see the "GNU Make Manual, Edition 0.51
+# passing "$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
+# $(CPPFLAGS)" as additional flags to the Fortran 77 compiler, since
+# this is how GNU Make does it; see the "GNU Make Manual, Edition 0.51
# for 'make' Version 3.76 Beta" (specifically, from info file
# '(make)Catalogue of Rules').
#
@@ -7724,14 +7725,18 @@ sub generate_makefile
}
# Catch some obsolete variables.
- reject_var 'INCLUDES', "'INCLUDES' is the obsolete name for " .
- "'AM_CPPFLAGS' (or '*_CPPFLAGS')";
- if (my $amflags = var ('ACLOCAL_AMFLAGS'))
+ if (my $ovar = var ('ACLOCAL_AMFLAGS'))
{
- msg_var 'obsolete', $amflags,
+ msg_var 'obsolete', $ovar,
"'ACLOCAL_AMFLAGS' is deprecated; use 'AC_CONFIG_MACRO_DIRS'"
. " in configure.ac instead";
}
+ if (my $ovar = var ('INCLUDES'))
+ {
+ msg_var 'obsolete', $ovar,
+ "'INCLUDES' is deprecated; you should use 'AM_CPPFLAGS'"
+ . " (or '*_CPPFLAGS') instead"
+ }
# Must do this after reading .am file.
define_variable ('subdir', $relative_dir, INTERNAL);
diff --git a/doc/automake.texi b/doc/automake.texi
index deb96d3a4..ec17160d8 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -6117,6 +6117,12 @@ files in the source directory are ignored.
@code{AM_CPPFLAGS} is ignored in preference to a per-executable (or
per-library) @code{_CPPFLAGS} variable if it is defined.
+@item INCLUDES
+This does the same job as @code{AM_CPPFLAGS} (or any per-target
+@code{_CPPFLAGS} variable if it is used). It is an older name for the
+same functionality. This variable is deprecated; we suggest using
+@code{AM_CPPFLAGS} and per-target @code{_CPPFLAGS} instead.
+
@item AM_CFLAGS
This is the variable the @file{Makefile.am} author can use to pass
in additional C compiler flags. In some situations, this is
@@ -6449,8 +6455,8 @@ assembly code. This compiler must work a bit like a C compiler; in
particular it must accept @option{-c} and @option{-o}. The values of
@code{CCASFLAGS} and @code{AM_CCASFLAGS} (or its per-target
definition) is passed to the compilation. For preprocessed files,
-@code{DEFS}, @code{DEFAULT_INCLUDES}, @code{CPPFLAGS} and
-@code{AM_CPPFLAGS} are also used.
+@code{DEFS}, @code{DEFAULT_INCLUDES}, @code{INCLUDES}, @code{CPPFLAGS}
+and @code{AM_CPPFLAGS} are also used.
The autoconf macro @code{AM_PROG_AS} will define @code{CCAS} and
@code{CCASFLAGS} for you (unless they are already set, it simply sets
@@ -6539,7 +6545,7 @@ command used is as follows:
@table @file
@item .F
-@code{$(F77) -F $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS)@*
+@code{$(F77) -F $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)@*
$(AM_FFLAGS) $(FFLAGS)}
@item .r
@@ -6562,7 +6568,7 @@ is as follows:
@code{$(F77) -c $(AM_FFLAGS) $(FFLAGS)}
@item .F
-@code{$(F77) -c $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS)@*
+@code{$(F77) -c $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)@*
$(AM_FFLAGS) $(FFLAGS)}
@item .r
diff --git a/t/includes-deprecation.sh b/t/includes-deprecation.sh
new file mode 100755
index 000000000..ec54359ae
--- /dev/null
+++ b/t/includes-deprecation.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2012-2013 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+# Support for $(INCLUDES) is deprecated.
+
+. test-init.sh
+
+echo AC_PROG_CC >> configure.ac
+
+$ACLOCAL
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = foo
+INCLUDES = -DFOO
+END
+
+AUTOMAKE_fails -Wnone -Wobsolete
+grep "^Makefile\\.am:2:.* 'INCLUDES'.* deprecated.* 'AM_CPPFLAGS'" stderr
+AUTOMAKE_run -Wall -Wno-obsolete
+test ! -s stderr
+
+echo 'AC_SUBST([INCLUDES])' >> configure.ac
+sed '/^INCLUDES/d' Makefile.am > t && mv -f t Makefile.am
+
+AUTOMAKE_run -Wno-error
+grep "^configure\\.ac:5:.* 'INCLUDES'.* deprecated.* 'AM_CPPFLAGS'" stderr
+
+:
diff --git a/t/includes-no-more.sh b/t/includes-no-more.sh
deleted file mode 100755
index 4867ee5a5..000000000
--- a/t/includes-no-more.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012-2013 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# Support for $(INCLUDES) has been removed.
-
-. test-init.sh
-
-echo AC_PROG_CC >> configure.ac
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-INCLUDES = -DFOO
-END
-
-$ACLOCAL
-AUTOMAKE_fails -Wnone -Wno-error
-grep "^Makefile\\.am:2:.* 'INCLUDES'.* obsolete.* 'AM_CPPFLAGS'" stderr
-
-:
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index c0fe1bd1e..1c069efff 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -500,7 +500,7 @@ t/help-silent.sh \
t/help-upc.sh \
t/hfs.sh \
t/implicit.sh \
-t/includes-no-more.sh \
+t/includes-deprecation.sh \
t/init.sh \
t/init2.sh \
t/insh2.sh \
diff --git a/t/warnopts.sh b/t/warnopts.sh
index 7e1a2d564..f1c4c8c34 100755
--- a/t/warnopts.sh
+++ b/t/warnopts.sh
@@ -63,12 +63,8 @@ test $(grep -v 'warnings are treated as errors' stderr | wc -l) = 3
rm -rf autom4te*.cache
# If we add a global -Wnone, all warnings should disappear.
-cat >configure.ac < t
+mv -f t configure.ac
$ACLOCAL
$AUTOMAKE
--
cgit v1.2.1
From d90001e3a90ea37fe6866120eb96be7bed8ba66c Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Tue, 30 Apr 2013 22:26:46 +0200
Subject: compat: substitute '@mkdir_p@' as '$(MKDIR_P)' unconditionally
We had started to do so only when the obsolete AM_PROG_MKDIR_P variable
was used, but that has recently turned out not to be not good enough,
because Gettext 0.18.2 (the latest one at the moment of writing) is using
the modern macro AC_PROG_MKDIR_P in its '*.m4' files, but at the same time
is still using the obsolete make variable '$(mkdir_p)' in its Makefile
fragments. This has been causing failures in real-world packages
bootstrapped with latest Gettext (0.18.2) and with bleeding-edge automake.
See for example:
And the worst things is that those failures have been basically silent
and unnoticeable up until the final "make install" --- that is, after
the affected package had been bootstrapped, configured and built. Yikes!
This issue has been reported to the Gettext developers:
But even if they will quickly fix it, Gettext 0.18.2 will remain
affected.
The fix we can implement in Automake is small and unobtrusive enough,
definitely worth having in order to save the users and developers from
having to deal with this hard-to-spot issue.
* m4/init.m4 (AM_INIT_AUTOMAKE): AC_SUBST '@mkdir_p@' to '$(MKDIR_P)'.
* t/am-prog-mkdir-p.sh: Enhance.
Signed-off-by: Stefano Lattarini
---
m4/init.m4 | 2 ++
t/am-prog-mkdir-p.sh | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/m4/init.m4 b/m4/init.m4
index f9b0965d8..9c7ab2f7f 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -22,6 +22,8 @@
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_PREREQ([2.65])dnl
+dnl Without this, packages using Gettext 0.18.2 might break horribly.
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
diff --git a/t/am-prog-mkdir-p.sh b/t/am-prog-mkdir-p.sh
index ad5a810f8..b561bfe04 100755
--- a/t/am-prog-mkdir-p.sh
+++ b/t/am-prog-mkdir-p.sh
@@ -67,4 +67,24 @@ $AUTOMAKE
$MAKE check-local
$MAKE distcheck
+# Now try using AC_PROG_MKDIR_P, but keeping the occurrences of
+# $(mkdir_p) and @mkdir_p@. This is to check against a regression
+# that hit us with Gettext 0.18.2.
+$MAKE maintainer-clean
+rm -rf autom4te*.cache
+
+sed 's/AM_PROG_MKDIR/AC_PROG_MKDIR/' configure.ac > t
+diff configure.ac t && fatal_ "failed to edit configure.ac"
+mv -f t configure.ac
+
+$ACLOCAL 2>stderr \
+ && $AUTOCONF -Wall -Werror 2>>stderr \
+ && test ! -s stderr \
+ || { cat stderr >&2; exit 1; }
+
+$AUTOMAKE
+./configure
+$MAKE check-local
+$MAKE distcheck
+
:
--
cgit v1.2.1
From 92aa1e944b01a176a49d63f9481294d506f36d2f Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Sun, 5 May 2013 00:58:00 +0200
Subject: master branch: we are going to become Automake 2.0
* configure.ac (AC_INIT): So adjust the beta version in here, from
1.13a to 1.99a.
* m4/amversion.m4: Regenerate.
Signed-off-by: Stefano Lattarini
---
configure.ac | 2 +-
m4/amversion.m4 | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 998425065..7dad97b48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
# along with this program. If not, see .
AC_PREREQ([2.69])
-AC_INIT([GNU Automake], [1.13a], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.99a], [bug-automake@gnu.org])
AC_CONFIG_SRCDIR([automake.in])
AC_CONFIG_AUX_DIR([lib])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index e8e5e360f..708ed3e13 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -12,10 +12,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13a'
+[am__api_version='1.99a'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.13a], [],
+m4_if([$1], [1.99a], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13a])dnl
+[AM_AUTOMAKE_VERSION([1.99a])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
--
cgit v1.2.1
From 7010b652966b23567be6e099d6e1c2e01441f213 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Sun, 5 May 2013 01:09:20 +0200
Subject: fixlet: remove leftover comment fragment
* configure.ac: Here.
Signed-off-by: Stefano Lattarini
---
configure.ac | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 7dad97b48..497c2b7a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,7 +176,6 @@ AC_MSG_RESULT([$result])
# FIXME: for file systems with sub-second timestamp resolutions, this
# FIXME: might be just one second (or even less if 'sleep' supports
# FIXME: non-integer arguments); is it worth pursuing that road?
-# than another we wait at least 5 seconds between creations.
AC_SUBST([MODIFICATION_DELAY], [2])
## ------------------------------------------- ##
--
cgit v1.2.1
From df3490b71af4c37a6df8aa6eacdeda8613438c20 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Mon, 6 May 2013 11:21:57 +0200
Subject: docs: fix warnings given by Texinfo 5.x
These warnings:
doc/automake.texi:3885: warning: node next `Public Macros' in menu \
`Private Macros' and in sectioning `Obsolete Macros' differ
doc/automake.texi:4050: warning: node `Private Macros' is next for \
`Obsolete Macros' in sectioning but not in menu
doc/automake.texi:4050: warning: node prev `Obsolete Macros' in menu \
`Private Macros' and in sectioning `Public Macros' differ
doc/automake.texi:4090: warning: node `Obsolete Macros' is next for \
`Private Macros' in menu but not in sectioning
doc/automake.texi:4090: warning: node prev `Private Macros' in menu \
`Public Macros' and in sectioning `Obsolete Macros' differ
* doc/automake.texi: Adjust.
Signed-off-by: Stefano Lattarini
---
doc/automake.texi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/automake.texi b/doc/automake.texi
index 9c46b5c45..db7d8a58d 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -178,7 +178,6 @@ Scanning @file{configure.ac}, using @command{aclocal}
* Optional:: Other things Automake recognizes
* aclocal Invocation:: Auto-generating aclocal.m4
* Macros:: Autoconf macros supplied with Automake
-* Obsolete Macros:: Obsolete macros you should no longer use
Auto-generating aclocal.m4
@@ -192,6 +191,7 @@ Auto-generating aclocal.m4
Autoconf macros supplied with Automake
* Public Macros:: Macros that you can use.
+* Obsolete Macros:: Obsolete macros you should no longer use
* Private Macros:: Macros that you should not use.
Directories
@@ -3876,8 +3876,8 @@ Automake ships with several Autoconf macros that you can use from your
@menu
* Public Macros:: Macros that you can use.
-* Private Macros:: Macros that you should not use.
* Obsolete Macros:: Obsolete macros you should no longer use
+* Private Macros:: Macros that you should not use.
@end menu
@c consider generating the following subsections automatically from m4 files.
--
cgit v1.2.1
From 1ffdec455d35762f8bd7a75f5922679bd9f63d16 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 10 May 2013 21:56:12 +0200
Subject: dist: remove support for shar and tarZ formats
See also discussion about automake wishlist bug#13324.
* lib/Automake/Options.pm: Give fatal errors (rather than warnings) if
the 'dist-shar' or 'dist-tarZ' options are used.
* lib/distdir.am: Remove the 'dist-tarZ' and 'dist-shar' targets, and
references to the '.tar.Z' and '.shar' archives.
* bin/automake.in (preprocess_file): Remove 'COMPRESS' and 'SHAR'
transforms.
(handle_dist): Remove lingering references to 'dist-tarZ' and 'dist-shar'
options.
* doc/automake.texi: Adjust, removing references to the removed targets
and distribution formats.
* t/dist-shar.sh: Adjust to expect fatal errors rather than warnings.
* t/dist-tarZ.sh: Likewise.
Signed-off-by: Stefano Lattarini
---
bin/automake.in | 4 +---
doc/automake.texi | 38 +++-----------------------------------
lib/Automake/Options.pm | 16 +++++++---------
lib/am/distdir.am | 24 ------------------------
t/dist-shar.sh | 14 +++++---------
t/dist-tarZ.sh | 27 +++++----------------------
6 files changed, 21 insertions(+), 102 deletions(-)
diff --git a/bin/automake.in b/bin/automake.in
index acbe48f5d..b5f048a40 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -3653,7 +3653,7 @@ sub handle_dist ()
{
my $archive_defined = option 'no-dist-gzip' ? 0 : 1;
$archive_defined ||=
- grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzip xz);
+ grep { option "dist-$_" } qw(zip bzip2 lzip xz);
error (option 'no-dist-gzip',
"no-dist-gzip specified but no dist-* specified,\n"
. "at least one archive format must be enabled")
@@ -6609,9 +6609,7 @@ sub preprocess_file
'XZ' => !! option 'dist-xz',
'LZIP' => !! option 'dist-lzip',
'BZIP2' => !! option 'dist-bzip2',
- 'COMPRESS' => !! option 'dist-tarZ',
'GZIP' => ! option 'no-dist-gzip',
- 'SHAR' => !! option 'dist-shar',
'ZIP' => !! option 'dist-zip',
'INSTALL-INFO' => ! option 'no-installinfo',
diff --git a/doc/automake.texi b/doc/automake.texi
index e1d0b425e..4912d3862 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8691,20 +8691,6 @@ default compression ratio, but with a progress indicator:
Generate a @samp{zip} archive of the distribution.
@trindex dist-zip
-@item @code{dist-tarZ}
-Generate a tar archive of the distribution, compressed with the
-historical (and obsolescent) program @command{compress}. This
-option is deprecated, and it and the corresponding functionality
-will be removed altogether in Automake 2.0.
-@trindex dist-tarZ
-
-@item @code{dist-shar}
-Generate a @samp{shar} archive of the distribution. This format
-archive is obsolescent, and use of this option is deprecated.
-It and the corresponding functionality will be removed altogether
-in Automake 2.0.
-@trindex dist-shar
-
@end table
The rule @code{dist} (and its historical synonym @code{dist-all})
@@ -10094,23 +10080,6 @@ Hook @code{dist-xz} to @code{dist}.
Hook @code{dist-zip} to @code{dist}.
@trindex dist-zip
-@item @option{dist-shar}
-@cindex Option, @option{dist-shar}
-@opindex dist-shar
-Hook @code{dist-shar} to @code{dist}. Use of this option
-is deprecated, as the @samp{shar} format is obsolescent and
-problematic. Support for it will be removed altogether in
-Automake 2.0.
-@trindex dist-shar
-
-@item @option{dist-tarZ}
-@cindex Option, @option{dist-tarZ}
-@opindex dist-tarZ
-Hook @code{dist-tarZ} to @code{dist}. Use of this option
-is deprecated, as the @samp{compress} program is obsolete.
-Support for it will be removed altogether in Automake 2.0.
-@trindex dist-tarZ
-
@item @option{filename-length-max=99}
@cindex Option, @option{filename-length-max=99}
@opindex filename-length-max=99
@@ -10283,8 +10252,7 @@ the source file. For instance, if the source file is
These three mutually exclusive options select the tar format to use
when generating tarballs with @samp{make dist}. (The tar file created
is then compressed according to the set of @option{no-dist-gzip},
-@option{dist-bzip2}, @option{dist-lzip}, @option{dist-xz} and
-@option{dist-tarZ} options in use.)
+@option{dist-bzip2}, @option{dist-lzip} and @option{dist-xz} in use).
These options must be passed as arguments to @code{AM_INIT_AUTOMAKE}
(@pxref{Macros}) because they can require additional configure checks.
@@ -13164,11 +13132,11 @@ suite failures, please attach the @file{test-suite.log} file.
@c LocalWords: installinfo vers MAKEINFO makeinfo MAKEINFOFLAGS noinstall rf
@c LocalWords: mandir thesame alsothesame installman myexecbin DESTDIR Pinard
@c LocalWords: uninstall installdirs uninstalls MOSTLYCLEANFILES mostlyclean
-@c LocalWords: DISTCLEANFILES MAINTAINERCLEANFILES GZIP gzip shar exp
+@c LocalWords: DISTCLEANFILES MAINTAINERCLEANFILES GZIP gzip exp
@c LocalWords: distdir distcheck distcleancheck listfiles distuninstallcheck
@c LocalWords: VPATH tarfile stdout XFAIL DejaGnu dejagnu DEJATOOL runtest ln
@c LocalWords: RUNTESTDEFAULTFLAGS toolchain RUNTESTFLAGS asis readme DVIPS
-@c LocalWords: installcheck gzipped tarZ std utils etags mkid cd
+@c LocalWords: installcheck gzipped std utils etags mkid cd
@c LocalWords: ARGS taggable ETAGSFLAGS lang ctags CTAGSFLAGS GTAGS gtags idl
@c LocalWords: foocc doit idlC multilibs ABIs cmindex defmac ARG enableval FC
@c LocalWords: MSG xtrue DBG pathchk CYGWIN afile proglink versioned CVS's TE
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 737d2a170..3105b11ef 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -332,20 +332,18 @@ sub _process_option_list (\%@)
error ($where, "support for lzma-compressed distribution " .
"archives has been removed");
}
- # TODO: Make this a fatal error in Automake 2.0.
+ # TODO: Remove this special check in Automake 3.0.
elsif ($_ eq 'dist-shar')
{
- msg ('obsolete', $where,
- "support for shar distribution archives is deprecated.\n" .
- " It will be removed in Automake 2.0");
+ error ($where, "support for shar distribution archives has " .
+ "been removed.");
}
- # TODO: Make this a fatal error in Automake 2.0.
+ # TODO: Remove this special check in Automake 3.0.
elsif ($_ eq 'dist-tarZ')
{
- msg ('obsolete', $where,
- "support for distribution archives compressed with " .
- "legacy program 'compress' is deprecated.\n" .
- " It will be removed in Automake 2.0");
+ error ($where, "support for distribution archives compressed " .
+ "with legacy program 'compress' has " .
+ "been removed.");
}
elsif (/^filename-length-max=(\d+)$/)
{
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 0e5f6bdb9..0e5e58682 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -336,24 +336,6 @@ dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
-?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z
-.PHONY: dist-tarZ
-dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__post_remove_distdir)
-
-?SHAR?DIST_ARCHIVES += $(distdir).shar.gz
-.PHONY: dist-shar
-dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__post_remove_distdir)
-
?ZIP?DIST_ARCHIVES += $(distdir).zip
.PHONY: dist-zip
dist-zip: distdir
@@ -363,11 +345,9 @@ dist-zip: distdir
?LZIP?DIST_TARGETS += dist-lzip
?XZ?DIST_TARGETS += dist-xz
-?SHAR?DIST_TARGETS += dist-shar
?BZIP2?DIST_TARGETS += dist-bzip2
?GZIP?DIST_TARGETS += dist-gzip
?ZIP?DIST_TARGETS += dist-zip
-?COMPRESS?DIST_TARGETS += dist-tarZ
endif %?TOPDIR_P%
@@ -418,10 +398,6 @@ distcheck: dist
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff --git a/t/dist-shar.sh b/t/dist-shar.sh
index cd0442552..5db0ade77 100755
--- a/t/dist-shar.sh
+++ b/t/dist-shar.sh
@@ -14,16 +14,17 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Check support for no-dist-gzip with dist-shar.
+# Trying to use removed option 'dist-shar' should trigger a clear
+# error message.
required=shar
. test-init.sh
-errmsg='support for shar .*deprecated'
+errmsg='support for shar .*removed'
echo AUTOMAKE_OPTIONS = dist-shar > Makefile.am
$ACLOCAL
-AUTOMAKE_fails -Wnone -Wobsolete
+AUTOMAKE_fails -Wnone -Wno-error
grep "^Makefile\\.am:1:.*$errmsg" stderr
cat > configure.ac <.
-# Check support for no-dist-gzip with dist-tarZ.
+# Trying to use removed option 'dist-tarZ' should trigger a clear
+# error message.
. test-init.sh
-# On Cygwin, as of 9/2/2012, 'compress' is provided by sharutils
-# and is just a dummy script that is not able to actually compress
-# (it can only decompress). So, check that the 'compress' program
-# is actually able to compress input.
-# Note that, at least on GNU/Linux, 'compress' does (and is
-# documented to) exit with status 2 if the output is larger than
-# the input after (attempted) compression; so we need to pass it
-# an input that it can actually reduce in size when compressing.
-for x in 1 2 3 4 5 6 7 8; do
- echo aaaaaaaaaaaaaaaaaaaaa
-done | compress -c >/dev/null \
- || skip_ "cannot find a working 'compress' program"
-
-errmsg=".*legacy .*'compress' .*deprecated"
+errmsg=".*legacy .*'compress'.* removed"
echo AUTOMAKE_OPTIONS = dist-tarZ > Makefile.am
$ACLOCAL
-AUTOMAKE_fails -Wnone -Wobsolete
+AUTOMAKE_fails -Wnone -Wno-error
grep "^Makefile\\.am:1:.*$errmsg" stderr
cat > configure.ac <
Date: Sat, 11 May 2013 01:13:46 +0200
Subject: options: consistently use return statuses to report errors (more)
This is a follow-up to commit 'v1.13.1d-128-g6e486c5', needed to deal
with errors that are only present in the 'master' branch (while the
reported commit was on the 'maint' branch).
* lib/Automake/Options.pm (_process_option_list): Adjust, where dealing
with the removed options 'dist-shar' and 'dist-tarZ'.
Signed-off-by: Stefano Lattarini
---
lib/Automake/Options.pm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index b0693bdb9..a6a42a7bf 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -344,6 +344,7 @@ sub _process_option_list (\%@)
{
error ($where, "support for shar distribution archives has " .
"been removed.");
+ $ret = 0;
}
# TODO: Remove this special check in Automake 3.0.
elsif ($_ eq 'dist-tarZ')
@@ -351,6 +352,7 @@ sub _process_option_list (\%@)
error ($where, "support for distribution archives compressed " .
"with legacy program 'compress' has " .
"been removed.");
+ $ret = 0;
}
elsif (/^filename-length-max=(\d+)$/)
{
--
cgit v1.2.1
From 020fb48db730a5661fa8fa38229b439d79fd5217 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Wed, 6 Jun 2012 10:27:46 +0200
Subject: subdir-objects: enable unconditionally
See automake bug#13378.
The fact that Automake-generated Makefiles places compiled object files
in the current directory by default, also when the corresponding source
file is in a subdirectory, is basically an historical accident, due to
the fact that the 'subdir-objects' option had only been introduced in
April 1999, starting with commit 'user-dep-gen-branchpoint-56-g88b5959',
and never made the default, likely to avoid backwards-compatibility
issues.
Since we believe the behaviour enabled by the 'subdir-objects' is the
only natural and most useful one, we make it the only only one available,
simplifying the Automake implementation and APIs a little in the process.
This change is basically an adjusted backport of Automake-NG commit
'v1.12.1-313-g14fe163' of 2012-06-07, "[ng] subdir-objects: enable
unconditionally".
* NEWS: Update.
* doc/automake.texi (Program and Library Variables): The output
object files are no longer placed in the current directory by
default, but rather in the same directory of the source file.
(LIBOBJS): Now the $(LIBOBJS) and $(ALLOCA) variables can also
be used outside of the directory where their sources lie.
(List of Automake options): Report the 'subdir-objects' option
as a no-op, existing only for compatibility with older versions
of Automake.
Other related minor adjustments.
* bin/automake.in (LANG_PROCESS): Remove, it's no longer needed.
(handle_languages): Don't test whether option 'subdir-objects'
is set (just assume it is), and do not use the '%SUBDIROBJ%'
transform when processing '.am' fragments.
(lang_sub_obj): Delete, it would just return 'LANG_SUBDIR'
unconditionally now.
(lang_lex_rewrite): Adjust. Don't test whether the option
'subdir-objects' is set (just assume it is).
(lang_yacc_rewrite): Likewise.
(handle_single_transform): Likewise. Remove an obsolete
comment. Add a proper "FIXME" comments about a fragment
of code that might have become dead code now.
(handle_LIBOBJS_or_ALLOCA): Simplify assuming that the option
'subdir-objects' is always set. Accordingly, there's no need
to warn anymore if '$(LIBOBJS)' or '$(ALLOCA)' are used outside
the '$config_libobj_dir' directory (as specified by autoconf
macro 'AC_CONFIG_LIBOBJ_DIR').
* lib/am/depend2.am: Assume the '?SUBDIROBJ?' Automake time
conditional is always true, and remove its uses accordingly.
* t/compile_f_c_cxx.sh: Adjust.
* t/cscope.tap: Likewise.
* t/depcomp8a.sh: Likewise.
* t/depcomp8b.sh: Likewise.
* t/libtool3.sh: Likewise.
* t/ltlibsrc.sh: Likewise.
* t/pr401.sh: Likewise.
* t/pr401b.sh: Likewise.
* t/pr401c.sh: Likewise.
* t/subobj.sh: Likewise.
* t/lex-line.sh: Likewise.
* t/yacc-line.sh: Likewise.
* t/yacc5.sh: Likewise.
* t/vala-libs.sh: Likewise.
* t/fort4.sh: Likewise, and extend a bit.
* t/fort5.sh: Likewise.
* t/gcj.sh: Likewise.
* t/subpkg.sh: Likewise.
* t/subpkg-yacc.sh: Likewise.
* t/xsource.sh: Likewise.
* t/libobj20a.sh: Remove as obsolete.
* t/libobj20b.sh: Adjust heading comments.
* t/libobj20c.sh: Likewise.
* t/subobj4.sh: Remove as obsolete.
* t/sourcefile-in-subdir.sh: Likewise.
Signed-off-by: Stefano Lattarini
---
NEWS | 10 +++++++
bin/automake.in | 74 ++++++++++++++---------------------------------
doc/automake.texi | 30 ++++++-------------
lib/am/depend2.am | 24 ++++++---------
t/compile_f_c_cxx.sh | 14 +++++++--
t/cscope.tap | 6 ++--
t/depcomp8a.sh | 19 +-----------
t/depcomp8b.sh | 27 ++---------------
t/fort4.sh | 39 +++++++++++++++----------
t/fort5.sh | 15 ++++------
t/gcj.sh | 37 +++++++++++++++++++++---
t/lex-line.sh | 32 ++++----------------
t/libobj20a.sh | 45 ----------------------------
t/libobj20b.sh | 2 +-
t/libobj20c.sh | 2 +-
t/libtool3.sh | 14 +++------
t/list-of-tests.mk | 3 --
t/ltlibsrc.sh | 2 +-
t/pr401.sh | 11 -------
t/pr401b.sh | 9 ------
t/pr401c.sh | 10 -------
t/sourcefile-in-subdir.sh | 36 -----------------------
t/subobj.sh | 32 +-------------------
t/subobj4.sh | 50 --------------------------------
t/subpkg-yacc.sh | 14 +++++++--
t/subpkg.sh | 7 +++--
t/xsource.sh | 18 +++++++-----
t/yacc-grepping2.sh | 30 ++-----------------
t/yacc-line.sh | 45 ++++++++--------------------
29 files changed, 184 insertions(+), 473 deletions(-)
delete mode 100755 t/libobj20a.sh
delete mode 100755 t/sourcefile-in-subdir.sh
delete mode 100755 t/subobj4.sh
diff --git a/NEWS b/NEWS
index 1d035b6fd..fa2582f67 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,15 @@
New in 2.0:
+* Compilation and object files:
+
+ - If a source file is placed in a subdirectory, the corresponding compiled
+ object will *always* be put into the subdirectory named after the source
+ file, rather than in the current directory. For instance, 'src/file.c'
+ and 'src/file.f90' will be compiled to 'src/file.o', and 'sub/dir/mu.cc'
+ will be compiled to 'sub/dir/mu.o'. Put in another way, Automake 1.14
+ and later will *unconditionally* behave as older Automake versions did
+ when the 'subdir-objects' option was given.
+
* Aclocal search path:
- Third-party m4 files located in the system-wide aclocal directory,
diff --git a/bin/automake.in b/bin/automake.in
index db1dfe4bd..d730dac71 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -183,7 +183,6 @@ my $gen_copyright = "\
# subdir if the source file is. In this case the file name cannot
# have '..' components.
use constant LANG_IGNORE => 0;
-use constant LANG_PROCESS => 1;
use constant LANG_SUBDIR => 2;
# These are used when keeping track of whether an object can be built
@@ -1291,8 +1290,7 @@ sub handle_languages ()
'FASTDEP' => $FASTDEP,
'-c' => $lang->compile_flag || '',
# These are not used, but they need to be defined
- # so transform() do not complain.
- SUBDIROBJ => 0,
+ # so transform() does not complain.
'DERIVED-EXT' => 'BUG',
DIST_SOURCE => 1,
VERBOSE => $verbose,
@@ -1308,9 +1306,7 @@ sub handle_languages ()
# needed.
my $output_flag = $lang->output_flag || '';
$output_flag = '-o'
- if (! $output_flag
- && $lang->name eq 'c'
- && option 'subdir-objects');
+ if (! $output_flag && $lang->name eq 'c');
# Compute a possible derived extension.
# This is not used by depend2.am.
@@ -1335,8 +1331,7 @@ sub handle_languages ()
# Plo, TPlo will be added later as appropriate). It is
# either hardcoded, or a shell variable ('$depbase') that
# will be computed by the rule.
- my $depbase =
- option ('subdir-objects') ? '$$depbase' : '$(DEPDIR)/$*';
+ my $depbase = '$$depbase';
$output_rules .=
file_contents ($rule_file,
new Automake::Location,
@@ -1355,8 +1350,7 @@ sub handle_languages ()
COMPILE => '$(' . $lang->compiler . ')',
LTCOMPILE => '$(LT' . $lang->compiler . ')',
- -o => $output_flag,
- SUBDIROBJ => !! option 'subdir-objects');
+ -o => $output_flag);
}
# Now include code for each specially handled object with this
@@ -1593,10 +1587,6 @@ sub handle_single_transform
next;
}
- # If the source file is in a subdirectory then the '.o' is put
- # into the current directory, unless the subdir-objects option
- # is in effect.
-
# Split file name into base and extension.
next if ! /^(?:(.*)\/)?([^\/]*)($KNOWN_EXTENSIONS_PATTERN)$/;
my $full = $_;
@@ -1648,7 +1638,7 @@ sub handle_single_transform
# generates another source file which we must then process
# further.
my $subr = \&{'lang_' . $lang->name . '_rewrite'};
- defined &$subr or $subr = \&lang_sub_obj;
+ defined &$subr or $subr = sub { return LANG_SUBDIR; };
my ($r, $source_extension)
= &$subr ($directory, $base, $extension,
$obj, $have_per_exec_flags, $var);
@@ -1739,11 +1729,7 @@ EOF
# flags are used) we cannot compile the file with an
# inference rule: we need an explicit rule.
#
- # If the source is in a subdirectory and the object is in
- # the current directory, we also need an explicit rule.
- #
# If both source and object files are in a subdirectory
- # (this happens when the subdir-objects option is used),
# then the inference will work.
#
# The latter case deserves a historical note. When the
@@ -1765,7 +1751,6 @@ EOF
# with GNU make, Solaris make, Ultrix make, BSD make,
# HP-UX make, and OSF1 make successfully.
if ($renamed
- || ($directory ne '' && ! option 'subdir-objects')
# We must also use specific rules for a nodist_ source
# if its language requests it.
|| ($lang->nodist_specific && ! $transform{'DIST_SOURCE'}))
@@ -1832,6 +1817,8 @@ EOF
next;
}
+ # FIXME: this is likely an internal error now that we use
+ # FIXME: subdir-objects unconditionally ...
err_am "object '$object' created by '$full' and '$object_map{$object}'"
if (defined $object_map{$object}
&& $object_map{$object} ne $full);
@@ -2218,27 +2205,19 @@ sub handle_LIBOBJS_or_ALLOCA
if ($config_libobj_dir
&& $relative_dir ne $config_libobj_dir)
{
- if (option 'subdir-objects')
- {
- # In the top-level Makefile we do not use $(top_builddir), because
- # we are already there, and since the targets are built without
- # a $(top_builddir), it helps BSD Make to match them with
- # dependencies.
- $dir = "$config_libobj_dir/"
- if $config_libobj_dir ne '.';
- $dir = backname ($relative_dir) . "/$dir"
- if $relative_dir ne '.';
- define_variable ('LIBOBJDIR', "$dir", INTERNAL);
- $clean_files{"\$($var)"} = MOSTLY_CLEAN;
- # If LTLIBOBJS is used, we must also clear LIBOBJS (which might
- # be created by libtool as a side-effect of creating LTLIBOBJS).
- $clean_files{"\$($var)"} = MOSTLY_CLEAN if $var =~ s/^LT//;
- }
- else
- {
- error ("'\$($var)' cannot be used outside '$config_libobj_dir' if"
- . " 'subdir-objects' is not set");
- }
+ # In the top-level Makefile we do not use $(top_builddir), because
+ # we are already there, and since the targets are built without
+ # a $(top_builddir), it helps BSD Make to match them with
+ # dependencies.
+ $dir = "$config_libobj_dir/"
+ if $config_libobj_dir ne '.';
+ $dir = backname ($relative_dir) . "/$dir"
+ if $relative_dir ne '.';
+ define_variable ('LIBOBJDIR', "$dir", INTERNAL);
+ $clean_files{"\$($var)"} = MOSTLY_CLEAN;
+ # If LTLIBOBJS is used, we must also clear LIBOBJS (which might
+ # be created by libtool as a side-effect of creating LTLIBOBJS).
+ $clean_files{"\$($var)"} = MOSTLY_CLEAN if $var =~ s/^LT//;
}
return $dir;
@@ -5472,13 +5451,6 @@ sub check_gnits_standards ()
# Note that the calls to these functions are computed, so don't bother
# searching for their precise names in the source.
-# This is just a convenience function that can be used to determine
-# when a subdir object should be used.
-sub lang_sub_obj ()
-{
- return option 'subdir-objects' ? LANG_SUBDIR : LANG_PROCESS;
-}
-
# Rewrite a single header file.
sub lang_header_rewrite
{
@@ -5500,9 +5472,8 @@ sub lang_yacc_rewrite
{
my ($directory, $base, $ext) = @_;
- my $r = lang_sub_obj;
(my $newext = $ext) =~ tr/y/c/;
- return ($r, $newext);
+ return (LANG_SUBDIR, $newext);
}
sub lang_yaccxx_rewrite { lang_yacc_rewrite (@_); };
@@ -5511,9 +5482,8 @@ sub lang_lex_rewrite
{
my ($directory, $base, $ext) = @_;
- my $r = lang_sub_obj;
(my $newext = $ext) =~ tr/l/c/;
- return ($r, $newext);
+ return (LANG_SUBDIR, $newext);
}
sub lang_lexxx_rewrite { lang_lex_rewrite (@_); };
diff --git a/doc/automake.texi b/doc/automake.texi
index 4912d3862..8965fb6a5 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -5633,18 +5633,13 @@ nodist_maude_SOURCES = nodist.c
dist_maude_SOURCES = dist-me.c
@end example
-By default the output file (on Unix systems, the @file{.o} file) will
-be put into the current build directory. However, if the option
-@option{subdir-objects} is in effect in the current directory then the
-@file{.o} file will be put into the subdirectory named after the
-source file. For instance, with @option{subdir-objects} enabled,
-@file{sub/dir/file.c} will be compiled to @file{sub/dir/file.o}. Some
-people prefer this mode of operation. You can specify
-@option{subdir-objects} in @code{AUTOMAKE_OPTIONS} (@pxref{Options}).
+The output file (on Unix systems, the @file{.o} file) will be put into the
+subdirectory named after the source file. For instance @file{file.c} will
+compiled to @file{file.o}, while @file{sub/dir/file.c} will be compiled to
+@file{sub/dir/file.o}.
@cindex Subdirectory, objects in
@cindex Objects in subdirectory
-
@item EXTRA_maude_SOURCES
Automake needs to know the list of files you intend to compile
@emph{statically}. For one thing, this is the only way Automake has of
@@ -6038,19 +6033,15 @@ tool1_SOURCES = @dots{}
tool2_SOURCES = @dots{}
@end example
-When option @option{subdir-objects} is not used, as in the above
-example, the variables @samp{$(LIBOBJS)} or @samp{$(ALLOCA)} can only
-be used in the directory where their sources lie. E.g., here it would
-be wrong to use @samp{$(LIBOBJS)} or @samp{$(ALLOCA)} in
-@file{src/Makefile.am}. However if both @option{subdir-objects} and
-@code{AC_CONFIG_LIBOBJ_DIR} are used, it is OK to use these variables
+The variables @samp{$(LIBOBJS)} or @samp{$(ALLOCA)} are typically
+used in the directory where their sources lie. However, if
+@code{AC_CONFIG_LIBOBJ_DIR} is used, it is OK to use these variables
in other directories. For instance @file{src/Makefile.am} could be
changed as follows.
@example
# src/Makefile.am
-AUTOMAKE_OPTIONS = subdir-objects
LDADD = $(LIBOBJS) $(ALLOCA)
bin_PROGRAMS = tool1 tool2 @dots{}
@@ -10228,11 +10219,8 @@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = false$(EXEEXT) true.sh
@item @option{subdir-objects}
@cindex Options, @option{subdir-objects}
@opindex subdir-objects
-If this option is specified, then objects are placed into the
-subdirectory of the build directory corresponding to the subdirectory of
-the source file. For instance, if the source file is
-@file{subdir/file.cxx}, then the output file would be
-@file{subdir/file.o}.
+This option does nothing; it exists solely for compatibility with
+older Automake versions.
@anchor{tar-formats}
@item @option{tar-v7}
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 5c6439ad6..a13379afb 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -40,11 +40,9 @@ if %FASTDEP%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
?!GENERIC? %VERBOSE%%COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
?!GENERIC? %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
-?GENERIC??!SUBDIROBJ? %VERBOSE%%COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJ% %SOURCEFLAG%%SOURCE%
-?GENERIC??!SUBDIROBJ? %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
-?GENERIC??SUBDIROBJ? %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-?GENERIC??SUBDIROBJ? %COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJ% %SOURCEFLAG%%SOURCE% &&\
-?GENERIC??SUBDIROBJ? $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
+?GENERIC? %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+?GENERIC? %COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJ% %SOURCEFLAG%%SOURCE% &&\
+?GENERIC? $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
@@ -67,11 +65,9 @@ if %FASTDEP%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
?!GENERIC? %VERBOSE%%COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJOBJ% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
?!GENERIC? %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
-?GENERIC??!SUBDIROBJ? %VERBOSE%%COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'`
-?GENERIC??!SUBDIROBJ? %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
-?GENERIC??SUBDIROBJ? %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-?GENERIC??SUBDIROBJ? %COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'` &&\
-?GENERIC??SUBDIROBJ? $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
+?GENERIC? %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+?GENERIC? %COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'` &&\
+?GENERIC? $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
@@ -96,11 +92,9 @@ if %FASTDEP%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
?!GENERIC? %VERBOSE%%LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %LTOBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
?!GENERIC? %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Plo
-?GENERIC??!SUBDIROBJ? %VERBOSE%%LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE%
-?GENERIC??!SUBDIROBJ? %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Plo
-?GENERIC??SUBDIROBJ? %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-?GENERIC??SUBDIROBJ? %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE% &&\
-?GENERIC??SUBDIROBJ? $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Plo
+?GENERIC? %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+?GENERIC? %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE% &&\
+?GENERIC? $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Plo
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
diff --git a/t/compile_f_c_cxx.sh b/t/compile_f_c_cxx.sh
index a0b0e216f..2562d7da0 100755
--- a/t/compile_f_c_cxx.sh
+++ b/t/compile_f_c_cxx.sh
@@ -38,9 +38,17 @@ END
$ACLOCAL
$AUTOMAKE
+$FGREP COMPILE Makefile.in # For debugging.
+
# Look for the macros at the beginning of rules.
-$FGREP "$tab\$(AM_V_CC)\$(COMPILE)" Makefile.in
-$FGREP "$tab\$(AM_V_CXX)\$(CXXCOMPILE)" Makefile.in
-$FGREP "$tab\$(AM_V_F77)\$(F77COMPILE)" Makefile.in
+sed < Makefile.in > mk \
+ -e 's|$(AM_V_CC)||g' \
+ -e 's|$(AM_V_CXX)||g' \
+ -e 's|$(AM_V_F77)||g'
+diff -u Makefile.in mk || : # For debugging.
+
+$FGREP "$tab\$(COMPILE)" mk
+$FGREP "$tab\$(CXXCOMPILE)" mk
+$FGREP "$tab\$(F77COMPILE)" mk
:
diff --git a/t/cscope.tap b/t/cscope.tap
index 9dbe01b2f..29feec228 100755
--- a/t/cscope.tap
+++ b/t/cscope.tap
@@ -22,10 +22,8 @@ plan_ 18
ocwd=$(pwd) || fatal_ "getting top-level directory"
-cat > configure.ac << 'END'
-AC_INIT([cscope-test], [1.0])
-AM_INIT_AUTOMAKE([subdir-objects])
-AC_CONFIG_FILES([Makefile sub/Makefile])
+cat >> configure.ac << 'END'
+AC_CONFIG_FILES([sub/Makefile])
AC_SUBST([CC], [who-cares])
AC_SUBST([CXX], [who-cares])
AC_SUBST([FC], [who-cares])
diff --git a/t/depcomp8a.sh b/t/depcomp8a.sh
index d6c73edb7..4cb545b97 100755
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
@@ -53,24 +53,7 @@ $ACLOCAL
$AUTOMAKE -a -Wno-unsupported
grep include Makefile.in # For debugging.
grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in
-grep 'include.*/\./\$(DEPDIR)' Makefile.in && exit 1
-
-$AUTOCONF
-# Don't reject slower dependency extractors, for better coverage.
-./configure --enable-dependency-tracking
-$MAKE
-cross_compiling || ./zardoz
-DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
-
-# Try again with subdir-objects option.
-
-echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
-
-$AUTOMAKE
-grep include Makefile.in # For debugging.
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
+LC_ALL=C grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
$AUTOCONF
diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh
index 879ee1c0d..c06c3c17a 100755
--- a/t/depcomp8b.sh
+++ b/t/depcomp8b.sh
@@ -24,16 +24,12 @@ required='cc libtoolize'
cat >> configure.ac << 'END'
AC_PROG_CC
-#x AM_PROG_CC_C_O
AM_PROG_AR
AC_PROG_LIBTOOL
AC_OUTPUT
END
cat > Makefile.am << 'END'
-## FIXME: stop disabling the warnings in the 'unsupported' category
-## FIXME: once the 'subdir-objects' option has been mandatory.
-AUTOMAKE_OPTIONS = -Wno-unsupported
lib_LTLIBRARIES = libzardoz.la
libzardoz_la_SOURCES = foo.c sub/bar.c
END
@@ -45,28 +41,9 @@ echo 'int bar (void) { return 0; }' > sub/bar.c
libtoolize
$ACLOCAL
-# FIXME: stop disabling the warnings in the 'unsupported' category
-# FIXME: once the 'subdir-objects' option has been mandatory.
-$AUTOMAKE -a -Wno-unsupported
+$AUTOMAKE -a
grep include Makefile.in # For debugging.
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in
-grep 'include.*/\./\$(DEPDIR)' Makefile.in && exit 1
-
-$AUTOCONF
-# Don't reject slower dependency extractors, for better coverage.
-./configure --enable-dependency-tracking
-$MAKE
-DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
-
-# Try again with subdir-objects option.
-
-echo AUTOMAKE_OPTIONS += subdir-objects >> Makefile.am
-
-$AUTOMAKE
-grep include Makefile.in # For debugging.
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
+LC_ALL=C grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
$AUTOCONF
diff --git a/t/fort4.sh b/t/fort4.sh
index 2ef27abeb..2d01ee46d 100755
--- a/t/fort4.sh
+++ b/t/fort4.sh
@@ -34,6 +34,7 @@ END
cat >bye.f90 <<'END'
program goodbye
call baz
+ call zar
stop
end
END
@@ -46,6 +47,7 @@ END
sed s,foo,bar, foo.f90 > sub/bar.f90
sed s,foo,baz, foo.f90 > sub/baz.f
+sed s,foo,zar, foo.f90 > sub/zardoz.f90
cat >>configure.ac <<'END'
AC_PROG_F77
@@ -59,9 +61,29 @@ END
cat >Makefile.am <<'END'
bin_PROGRAMS = hello goodbye
hello_SOURCES = hello.f foo.f90 sub/bar.f90
-goodbye_SOURCES = bye.f90 sub/baz.f
+goodbye_SOURCES = bye.f90 sub/baz.f sub/zardoz.f90
goodbye_FCFLAGS =
LDADD = $(FCLIBS)
+
+.PHONY: test-obj
+test-obj:
+ ls -l . sub # For debugging.
+ test -f hello.$(OBJEXT)
+ test -f foo.$(OBJEXT)
+ test -f sub/bar.$(OBJEXT)
+ test ! -f bar.$(OBJEXT)
+ test -f goodbye-bye.$(OBJEXT)
+ test ! -f bye.$(OBJEXT)
+ test -f sub/goodbye-zardoz.$(OBJEXT)
+ test ! -f sub/zardoz.$(OBJEXT)
+ test ! -f goodbye-zardoz.$(OBJEXT)
+ test ! -f zardoz.$(OBJEXT)
+## The setting of FCFLAGS should only cause objects deriving from
+## Fortran 90, not Fortran 77, to be renamed.
+ test -f sub/baz.$(OBJEXT)
+ test ! -f sub/goodbye-baz.$(OBJEXT)
+ test ! -f goodbye-baz.$(OBJEXT)
+ test ! -f baz.$(OBJEXT)
END
$ACLOCAL
@@ -73,22 +95,9 @@ $AUTOCONF
# ./configure may exit with status 77 if no compiler is found,
# or if the compiler cannot compile Fortran 90 files).
./configure
-$MAKE
-subobjs=$(echo sub/*.o sub/*.obj)
-test "$subobjs" = 'sub/*.o sub/*.obj'
-$MAKE distcheck
-$MAKE distclean
-echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am
-$AUTOMAKE
-./configure
$MAKE
-test ! -e bar.o
-test ! -e bar.obj
-test ! -e baz.o
-test ! -e baz.obj
-test ! -e goodbye-baz.o
-test ! -e goodbye-baz.obj
+$MAKE test-obj
$MAKE distcheck
:
diff --git a/t/fort5.sh b/t/fort5.sh
index 7b9991b96..d090f6ffd 100755
--- a/t/fort5.sh
+++ b/t/fort5.sh
@@ -90,20 +90,17 @@ grep " --tag=FC" Makefile.in
# ./configure may exit with status 77 if no compiler is found,
# or if the compiler cannot compile Fortran 90 files).
./configure
-$MAKE
-subobjs=$(echo sub/*.lo)
-test "$subobjs" = 'sub/*.lo'
-$MAKE distcheck
-# The following will be fixed in a later patch:
-$MAKE distclean
-echo 'AUTOMAKE_OPTIONS = subdir-objects' >> Makefile.am
-$AUTOMAKE -a
-./configure
$MAKE
+test -f sub/bar.lo
test ! -e bar.lo
+## The setting of FCFLAGS should only cause objects deriving from
+## Fortran 90, not Fortran 77, to be renamed.
+test -f sub/baz.lo
test ! -e baz.lo
+test ! -e sub/libgoodbye_la-baz.lo
test ! -e libgoodbye_la-baz.lo
+
$MAKE distcheck
:
diff --git a/t/gcj.sh b/t/gcj.sh
index 3de295363..3b058a5c2 100755
--- a/t/gcj.sh
+++ b/t/gcj.sh
@@ -16,21 +16,50 @@
# Test of compiled java.
+required='gcc gcj'
. test-init.sh
cat >> configure.ac << 'END'
-_AM_DEPENDENCIES([GCJ])
-AC_SUBST([GCJ])
+# FIXME: AM_PROG_GCJ should cause OBJEXT and EXEEXT to be set, but
+# FIXME: it currently does not. See also xfailing test 'gcj6.sh'.
+AC_PROG_CC
+AM_PROG_GCJ
+AC_OUTPUT
END
cat > Makefile.am << 'END'
bin_PROGRAMS = convert
-convert_SOURCES = x/y/convert.java
+convert_SOURCES = $(my_java_source)
+convert_LDFLAGS = --main=convert
+my_java_source = x/y/convert.java
+$(my_java_source):
+ rm -f $@-t $@
+ test -d $(@D) || $(MKDIR_P) $(@D)
+ echo 'public class convert {' >> $@-t
+ echo ' public static void main (String[] args) {' >> $@-t
+ echo ' System.out.println("Hello, World!");' >> $@-t
+ echo ' }' >> $@-t
+ echo '}' >> $@-t
+ chmod a-w $@-t && mv -f $@-t $@
+.PHONY: test-obj
+check-local: test-obj
+test-obj:
+ test -f x/y/convert.$(OBJEXT)
END
$ACLOCAL
$AUTOMAKE
+$FGREP 'x/y/convert.$(OBJEXT)' Makefile.in
-grep '^x/y/convert' Makefile.in
+$AUTOCONF
+./configure
+
+$MAKE
+$MAKE test-obj
+if ! cross_compiling; then
+ ./convert
+ test "$(./convert)" = 'Hello, World!'
+fi
+$MAKE distcheck
:
diff --git a/t/lex-line.sh b/t/lex-line.sh
index 258f6af56..ec9fcd3f7 100755
--- a/t/lex-line.sh
+++ b/t/lex-line.sh
@@ -15,15 +15,13 @@
# along with this program. If not, see .
# Check that automake lex support ensures that lex-generated C
-# files use correct "#line" directives. Try also with the
-# 'subdir-object' option enabled.
+# files use correct "#line" directives.
# See also sister test 'yacc-line.sh'.
required='cc lex'
. test-init.sh
cat >> configure.ac << 'END'
-AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
AC_PROG_LEX
AC_OUTPUT
@@ -32,7 +30,6 @@ END
mkdir dir sub sub/dir
cat > Makefile.am << 'END'
-SUBDIRS = sub
bin_PROGRAMS = foo bar
LDADD = $(LEXLIB)
bar_LFLAGS = -v
@@ -43,19 +40,6 @@ zardoz.@OBJEXT@: zardoz.c
bar-quux.@OBJEXT@: bar-quux.c
END
-cat > sub/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-noinst_PROGRAMS = foo bar
-## We already used $(LEXLIB) above, so try @LEXLIB@ now.
-LDADD = @LEXLIB@
-foo_LFLAGS = -v
-foo_SOURCES = zardoz.l
-bar_SOURCES = dir/quux.l
-## Avoid spurious failures with Solaris make.
-foo-zardoz.@OBJEXT@: foo-zardoz.c
-dir/quux.@OBJEXT@: dir/quux.c
-END
-
cat > zardoz.l << 'END'
%{
#define YY_NO_UNISTD_H 1
@@ -79,10 +63,8 @@ int yywrap (void)
END
cp zardoz.l dir/quux.l
-cp zardoz.l sub/zardoz.l
-cp zardoz.l sub/dir/quux.l
-c_outputs='zardoz.c bar-quux.c sub/foo-zardoz.c sub/dir/quux.c'
+c_outputs='zardoz.c dir/bar-quux.c'
$ACLOCAL
$AUTOCONF
@@ -104,7 +86,7 @@ for vpath in : false; do
$MAKE
# For debugging,
- ls -l . sub sub/dir
+ ls -l . dir
$EGREP 'line|\.l' $c_outputs
grep '#.*line.*build.*\.l' $c_outputs && exit 1
@@ -118,14 +100,10 @@ for vpath in : false; do
grep "#.*\.l.*\.l" $c_outputs && exit 1
if $vpath; then
grep '#.*line.*"\.\./zardoz\.l"' zardoz.c
- grep '#.*line.*"\.\./dir/quux\.l"' bar-quux.c
- grep '#.*line.*"\.\./\.\./sub/zardoz\.l"' sub/foo-zardoz.c
- grep '#.*line.*"\.\./\.\./sub/dir/quux\.l"' sub/dir/quux.c
+ grep '#.*line.*"\.\./dir/quux\.l"' dir/bar-quux.c
else
grep '#.*line.*"zardoz\.l"' zardoz.c
- grep '#.*line.*"dir/quux\.l"' bar-quux.c
- grep '#.*line.*"zardoz\.l"' sub/foo-zardoz.c
- grep '#.*line.*"dir/quux\.l"' sub/dir/quux.c
+ grep '#.*line.*"dir/quux\.l"' dir/bar-quux.c
fi
cd $srcdir
diff --git a/t/libobj20a.sh b/t/libobj20a.sh
deleted file mode 100755
index 635798c1a..000000000
--- a/t/libobj20a.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010-2013 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# Test error reporting for AC_CONFIG_LIBOBJ_DIR.
-# See also sister tests 'libobj20b.sh' and 'libobj20c.sh'.
-
-. test-init.sh
-
-cat >> configure.ac << 'END'
-AC_CONFIG_LIBOBJ_DIR([libobj-dir])
-AC_PROG_CC
-AM_PROG_AR
-AC_PROG_RANLIB
-AC_LIBOBJ([foo])
-END
-
-cat > Makefile.am << 'END'
-noinst_LIBRARIES = libtu.a
-libtu_a_SOURCES =
-libtu_a_LIBADD = $(LIBOBJS)
-END
-
-mkdir libobj-dir
-: > libobj-dir/foo.c
-: > ar-lib
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'LIBOBJS.*used outside.*libobj-dir' stderr
-grep 'subdir-objects.*not set' stderr
-
-:
diff --git a/t/libobj20b.sh b/t/libobj20b.sh
index f86a46c15..70442dd17 100755
--- a/t/libobj20b.sh
+++ b/t/libobj20b.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see .
# Test error reporting for AC_CONFIG_LIBOBJ_DIR.
-# See also sister tests 'libobj20a.sh' and 'libobj20c.sh'.
+# See also sister test 'libobj20c.sh'.
. test-init.sh
diff --git a/t/libobj20c.sh b/t/libobj20c.sh
index 7b918021e..5f8eb688d 100755
--- a/t/libobj20c.sh
+++ b/t/libobj20c.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see .
# Test error reporting for AC_CONFIG_LIBOBJ_DIR.
-# See also sister tests 'libobj20a.sh' and 'libobj20b.sh'.
+# See also sister test 'libobj20b.sh'.
. test-init.sh
diff --git a/t/libtool3.sh b/t/libtool3.sh
index 5653280e6..4f45a3967 100755
--- a/t/libtool3.sh
+++ b/t/libtool3.sh
@@ -28,10 +28,6 @@ AC_OUTPUT
END
cat > Makefile.am << 'END'
-# FIXME: stop disabling the warnings in the 'unsupported' category
-# FIXME: once the 'subdir-objects' option has been mandatory.
-AUTOMAKE_OPTIONS = -Wno-unsupported
-
lib_LTLIBRARIES = lib0.la liba/liba.la
lib0_la_SOURCES = 0.c
liba_liba_la_SOURCES = liba/a.c
@@ -79,12 +75,10 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE --add-missing --copy
-# We need explicit rules to build 1.o and a.lo. Make sure
-# Automake did not output additional rules for 1.lo and and a.lo.
-$FGREP '1.o:' Makefile.in
-$FGREP '1.lo:' Makefile.in && exit 1
-$FGREP 'a.o:' Makefile.in && exit 1
-$FGREP 'a.lo:' Makefile.in
+# We shouldn't need explicit rules.
+grep -v '^\.c' Makefile.in \
+ | $FGREP -v '$(am__dirstamp)' \
+ | $EGREP '\.(o|obj|lo).*:' && exit 1
./configure
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 0d6f5d1b7..18109ac22 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -604,7 +604,6 @@ t/libobj16b.sh \
t/libobj17.sh \
t/libobj18.sh \
t/libobj19.sh \
-t/libobj20a.sh \
t/libobj20b.sh \
t/libobj20c.sh \
t/library.sh \
@@ -991,7 +990,6 @@ t/silent-configsite.sh \
t/silent-nested-vars.sh \
t/silent-custom.sh \
t/src-acsubst.sh \
-t/sourcefile-in-subdir.sh \
t/space.sh \
t/specflg6.sh \
t/specflg7.sh \
@@ -1028,7 +1026,6 @@ t/subdir-distclean.sh \
t/subdir-keep-going-pr12554.sh \
t/subobj.sh \
t/subobj2.sh \
-t/subobj4.sh \
t/subobj5.sh \
t/subobj6.sh \
t/subobj7.sh \
diff --git a/t/ltlibsrc.sh b/t/ltlibsrc.sh
index 8c8098bdb..04a029fe7 100755
--- a/t/ltlibsrc.sh
+++ b/t/ltlibsrc.sh
@@ -33,7 +33,7 @@ AM_LDFLAGS = -module
pkglib_LTLIBRARIES = zoo.d/bar.la old.la
noinst_LTLIBRARIES = foo.la zoo.d/old2.la
-$(srcdir)/zoo_d_old2_la.c: $(srcdir)/old_la.c
+zoo_d_old2_la.c: $(srcdir)/old_la.c
cp $(srcdir)/old_la.c $@
AUTOMAKE_OPTIONS = -Wno-unsupported
diff --git a/t/pr401.sh b/t/pr401.sh
index 89094de75..090b2e903 100755
--- a/t/pr401.sh
+++ b/t/pr401.sh
@@ -102,17 +102,6 @@ $AUTOMAKE
test ! -e lib/lib
$MAKE distcheck
-## -------------------------------------------- ##
-## Error message with usage in wrong directory. ##
-## -------------------------------------------- ##
-
-mv -f src/Makefile.am src/t
-sed 's/LDADD = .*/LDADD = @LIBOBJS@/' src/t > src/Makefile.am
-AUTOMAKE_fails
-grep 'cannot be used outside.*lib' stderr
-mv -f src/t src/Makefile.am
-
-
## -------------------------------------------- ##
## Test using LIBOBJS from a sibling directory. ##
## -------------------------------------------- ##
diff --git a/t/pr401b.sh b/t/pr401b.sh
index cf7a69885..f993108bb 100755
--- a/t/pr401b.sh
+++ b/t/pr401b.sh
@@ -103,15 +103,6 @@ $AUTOMAKE -a
test ! -e lib/lib
$MAKE distcheck
-## -------------------------------------------- ##
-## Error message with usage in wrong directory. ##
-## -------------------------------------------- ##
-
-mv -f src/Makefile.am src/t
-sed 's/LDADD = .*/LDADD = @LTLIBOBJS@/' src/t > src/Makefile.am
-AUTOMAKE_fails
-grep 'cannot be used outside.*lib' stderr
-mv -f src/t src/Makefile.am
## ---------------------------------------------- ##
## Test using LTLIBOBJS from a sibling directory. ##
diff --git a/t/pr401c.sh b/t/pr401c.sh
index 22e587629..eb2f4fb7b 100755
--- a/t/pr401c.sh
+++ b/t/pr401c.sh
@@ -104,16 +104,6 @@ $AUTOMAKE
test ! -e lib/lib
$MAKE distcheck
-## -------------------------------------------- ##
-## Error message with usage in wrong directory. ##
-## -------------------------------------------- ##
-
-mv -f src/Makefile.am src/t
-sed 's/LDADD = .*/LDADD = @ALLOCA@/' src/t > src/Makefile.am
-AUTOMAKE_fails
-grep 'cannot be used outside.*lib' stderr
-mv -f src/t src/Makefile.am
-
## ------------------------------------------- ##
## Test using ALLOCA from a sibling directory. ##
diff --git a/t/sourcefile-in-subdir.sh b/t/sourcefile-in-subdir.sh
deleted file mode 100755
index 1054f18aa..000000000
--- a/t/sourcefile-in-subdir.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999-2013 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# Test to make sure subdir source file generates explicit dependency.
-
-. test-init.sh
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zardoz widdershins
-zardoz_SOURCES = y.c x/z.c
-widdershins_SOURCES = x/z.c
-END
-
-cat >> configure.ac << 'END'
-AC_PROG_CC
-END
-
-$ACLOCAL
-$AUTOMAKE -Wno-unsupported
-
-grep '^z\.o: x/z\.c$' Makefile.in
-
-:
diff --git a/t/subobj.sh b/t/subobj.sh
index f595e68ad..fa0036803 100755
--- a/t/subobj.sh
+++ b/t/subobj.sh
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-# Test of subdir objects with C and C++.
+# Grepping checks on subdir objects with C and C++.
. test-init.sh
@@ -42,36 +42,6 @@ dream_SOURCES = generic/b.c more/r.y
bin_PROGRAMS = dream
END
-AUTOMAKE_fails
-grep "^Makefile\.am:3:.*'generic/a\.c'.* in a subdirectory" stderr
-grep "^Makefile\.am:[34]:.*'another/z\.cxx'.* in a subdirectory" stderr
-grep "^sub/Makefile\.am:1:.*'generic/b\.c'.* in a subdirectory" stderr
-grep "option 'subdir-objects' is disabled" stderr
-# Verbose tips should be given, but not too many times.
-for msg in \
- "possible forward-incompatibility" \
- "advi[sc]e.* 'subdir-objects' option throughout" \
- "unconditionally.* object file.* same subdirectory" \
-; do
- test $(grep -c "$msg" stderr) -eq 1
-done
-
-# Guard against stupid typos.
-grep 'subdir-object([^s]|$)' stderr && exit 1
-
-$AUTOMAKE -Wno-unsupported
-
-echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
-AUTOMAKE_fails
-grep "^Makefile\.am" stderr && exit 1
-grep "^sub/Makefile\.am:.*'generic/b\.c'.* in a subdirectory" stderr
-grep "option 'subdir-objects' is disabled" stderr
-
-sed 's/^AM_INIT_AUTOMAKE/&([subdir-objects])/' configure.ac > configure.tmp
-mv -f configure.tmp configure.ac
-$ACLOCAL --force
-$AUTOMAKE
-
rm -f compile
$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
diff --git a/t/subobj4.sh b/t/subobj4.sh
deleted file mode 100755
index dbbed30be..000000000
--- a/t/subobj4.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001-2013 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# Make sure '../foo/foo.cpp' generates a rule.
-# Report from Dave Brolley.
-
-. test-init.sh
-
-cat >> configure.ac << 'END'
-AC_PROG_CC
-AC_PROG_CXX
-AC_CONFIG_FILES([d1/Makefile d2/Makefile])
-AC_OUTPUT
-END
-
-mkdir d1 d2
-
-cat > Makefile.am << 'END'
-SUBDIRS = d1 d2
-END
-
-cat > d1/Makefile.am << 'END'
-bin_PROGRAMS = z
-z_SOURCES = ../d2/z.c
-END
-
-cat > d2/Makefile.am << 'END'
-END
-
-: > d2/z.c
-
-$ACLOCAL
-$AUTOMAKE -Wno-unsupported
-
-grep '\$(CC) .*\.\./d2/z\.c' d1/Makefile.in
-
-:
diff --git a/t/subpkg-yacc.sh b/t/subpkg-yacc.sh
index 9fc676190..1fe50a572 100755
--- a/t/subpkg-yacc.sh
+++ b/t/subpkg-yacc.sh
@@ -20,13 +20,17 @@
required='cc yacc'
. test-init.sh
-cat >>configure.ac <<'END'
+cat > configure.ac <<'END'
+AC_INIT([suya], [0.5a], [automake-bug@gnu.org])
+AM_INIT_AUTOMAKE([foreign -Wall])
AC_PROG_CC
+AC_CONFIG_FILES([Makefile])
AC_CONFIG_SUBDIRS([lib])
AC_OUTPUT
END
cat >Makefile.am <<'EOF'
+AUTOMAKE_OPTIONS = -Wno-override
SUBDIRS = lib
bin_PROGRAMS = MU
MU_LDADD = lib/liblib.a
@@ -106,14 +110,18 @@ EOF
$ACLOCAL
$AUTOCONF
-$AUTOMAKE -Wno-override
+$AUTOMAKE
+test ! -e ylwrap
+test ! -e ar-lib
cd lib
$ACLOCAL
$AUTOCONF
$AUTOHEADER
-$AUTOMAKE -Wno-override --add-missing
+$AUTOMAKE --add-missing
cd ..
+test -f ylwrap
+test -f ar-lib
./configure
diff --git a/t/subpkg.sh b/t/subpkg.sh
index f9cdc74e2..f1e3f2b3a 100755
--- a/t/subpkg.sh
+++ b/t/subpkg.sh
@@ -23,7 +23,7 @@ mkdir m4
cat >m4/foo.m4 <<'EOF'
AC_DEFUN([FOO],[
- AC_PROG_CC
+ AC_REQUIRE([AC_PROG_CC])
AC_OUTPUT
])
EOF
@@ -102,7 +102,10 @@ $AUTOHEADER
$AUTOMAKE -Wno-override --add-missing
cd ..
-./configure
+./configure >stdout || { cat stdout; exit 1; }
+cat stdout
+grep '^checking whether cc understands -c and -o together' stdout
+
$MAKE
$MAKE distcheck
test ! -e subpack-1 # Make sure distcheck cleans up after itself.
diff --git a/t/xsource.sh b/t/xsource.sh
index a3fe6e514..70dfd4e74 100755
--- a/t/xsource.sh
+++ b/t/xsource.sh
@@ -21,18 +21,22 @@
cat > Makefile.am << 'END'
bin_PROGRAMS = zardoz
-zardoz_SOURCES = z.c x/z.c
+lib_LTLIBRARIES = libfoo.la
+zardoz_SOURCES = z.c
+libfoo_la_SOURCES = z.c
END
+: > ltmain.sh
+: > config.guess
+: > config.sub
+
cat >> configure.ac << 'END'
AC_PROG_CC
+AC_SUBST([LIBTOOL], [unused])
END
-mkdir x
-
-: > z.c
-: > x/z.c
-
$ACLOCAL
AUTOMAKE_fails
-$FGREP 'z.$(OBJEXT)' stderr
+$FGREP "object 'z.\$(OBJEXT)' created both with libtool and without" stderr
+
+:
diff --git a/t/yacc-grepping2.sh b/t/yacc-grepping2.sh
index 3c5da2255..eb4afeda1 100755
--- a/t/yacc-grepping2.sh
+++ b/t/yacc-grepping2.sh
@@ -24,57 +24,33 @@ AC_PROG_CC
AC_PROG_YACC
END
-cat > Makefile.am << 'END'
-bin_PROGRAMS = maude
-maude_SOURCES = sub/maude.y
-END
-
-mkdir sub
-
-: > sub/maude.y
-
$ACLOCAL
-# FIXME: stop disabling the warnings in the 'unsupported' category
-# FIXME: once the 'subdir-objects' option has been mandatory.
-$AUTOMAKE -a -Wno-unsupported
-
-grep '^maude\.c:.*maude\.y' Makefile.in
-
-
-## Try again with subdir-objects.
cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
bin_PROGRAMS = maude
maude_SOURCES = sub/maude.y
END
$AUTOMAKE -a
-
# No rule needed, the default .y.c: inference rule is enough
# (but there may be an additional dependency on a dirstamp file).
grep '^sub/maude\.c:.*maude\.y' Makefile.in && exit 1
-
## Try again with per-exe flags.
cat > Makefile.am << 'END'
bin_PROGRAMS = maude
maude_SOURCES = sub/maude.y
-## A particularly trickey case.
+## A particularly tricky case.
maude_YFLAGS = -d
END
-# FIXME: stop disabling the warnings in the 'unsupported' category
-# FIXME: once the 'subdir-objects' option has been mandatory.
-$AUTOMAKE -a -Wno-unsupported
-
+$AUTOMAKE -a
+grep '^sub/maude-maude\.c:.*sub/maude\.y' Makefile.in
# Rule should use maude_YFLAGS.
grep 'AM_YFLAGS.*maude' Makefile.in && exit 1
-
# Silly regression.
grep 'maudec' Makefile.in && exit 1
-
# Make sure the .o file is required.
grep '^am_maude_OBJECTS.*maude' Makefile.in
diff --git a/t/yacc-line.sh b/t/yacc-line.sh
index b034af36e..d0c630046 100755
--- a/t/yacc-line.sh
+++ b/t/yacc-line.sh
@@ -15,43 +15,26 @@
# along with this program. If not, see .
# Check that automake yacc support ensures that yacc-generated C
-# files use correct "#line" directives. Try also with the
-# 'subdir-object' option enabled.
-# See also sister test 'lex-line.sh'.
+# files use correct "#line" directives.
+# See also sister test 'lex-line.test'.
required='cc yacc'
. test-init.sh
cat >> configure.ac << 'END'
-AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
AC_PROG_YACC
AC_OUTPUT
END
-mkdir dir sub sub/dir
+mkdir dir
cat > Makefile.am << 'END'
-SUBDIRS = sub
-bin_PROGRAMS = foo bar
-AM_YFLAGS = -d
-bar_YFLAGS =
+noinst_PROGRAMS = foo bar baz
+baz_YFLAGS = -d
foo_SOURCES = zardoz.y
bar_SOURCES = dir/quux.y
-## Avoid spurious failures with Solaris make.
-zardoz.@OBJEXT@: zardoz.c
-bar-quux.@OBJEXT@: bar-quux.c
-END
-
-cat > sub/Makefile.am << 'END'
-AUTOMAKE_OPTIONS = subdir-objects
-noinst_PROGRAMS = foo bar
-foo_YFLAGS = -d
-foo_SOURCES = zardoz.y
-bar_SOURCES = dir/quux.y
-## Avoid spurious failures with Solaris make.
-foo-zardoz.@OBJEXT@: foo-zardoz.c
-dir/quux.@OBJEXT@: dir/quux.c
+baz_SOURCES = zardoz.y
END
cat > zardoz.y << 'END'
@@ -69,10 +52,8 @@ int main(void)
END
cp zardoz.y dir/quux.y
-cp zardoz.y sub/zardoz.y
-cp zardoz.y sub/dir/quux.y
-c_outputs='zardoz.c bar-quux.c sub/foo-zardoz.c sub/dir/quux.c'
+c_outputs='zardoz.c dir/quux.c baz-zardoz.c'
$ACLOCAL
$AUTOCONF
@@ -94,7 +75,7 @@ for vpath in : false; do
$MAKE
# For debugging,
- ls -l . sub sub/dir
+ ls -l . dir
$EGREP 'line|\.y' $c_outputs
# Adjusted "#line" should not contain reference to the builddir.
@@ -109,14 +90,12 @@ for vpath in : false; do
grep "#.*\.y.*\.y" $c_outputs && exit 1
if $vpath; then
grep '#.*line.*"\.\./zardoz\.y"' zardoz.c
- grep '#.*line.*"\.\./dir/quux\.y"' bar-quux.c
- grep '#.*line.*"\.\./\.\./sub/zardoz\.y"' sub/foo-zardoz.c
- grep '#.*line.*"\.\./\.\./sub/dir/quux\.y"' sub/dir/quux.c
+ grep '#.*line.*"\.\./zardoz\.y"' baz-zardoz.c
+ grep '#.*line.*"\.\./dir/quux\.y"' dir/quux.c
else
grep '#.*line.*"zardoz\.y"' zardoz.c
- grep '#.*line.*"dir/quux\.y"' bar-quux.c
- grep '#.*line.*"zardoz\.y"' sub/foo-zardoz.c
- grep '#.*line.*"dir/quux\.y"' sub/dir/quux.c
+ grep '#.*line.*"zardoz\.y"' baz-zardoz.c
+ grep '#.*line.*"dir/quux\.y"' dir/quux.c
fi
cd $srcdir
--
cgit v1.2.1
From 5b40c4e744ddd42ab823f0938bb9d96b34aec58e Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Tue, 8 Jan 2013 14:04:00 +0100
Subject: cleanup: having subdir-objects mandatory allow us some
simplifications
Few minor cleanups made possible by earlier changes, plus other minor
cleanups triggered in cascade. No semantic change is intended.
This is a follow-up on previous commit 'v1.13.1d-214-g3ad07d2', and
an adjusted backport of Automake-NG commit 'v1.12.1-315-gc97d41b'
of 2012-06-08 ([ng] cleanup: after enabling of subdir-objects
unconditionally).
* bin/automake.in (LANG_IGNORE, LANG_SUBDIR): Remove.
(handle_languages): Drop the '%DEPBASE%' transform when processing
the '$rule_file'.
(register_language ('name' => 'vala', ...)): Add '.vapi' to the entry
'extensions', and simplify the entry 'output_extensions' to point to
a dummy subroutine (since it wasn't really used anyway).
(handle_single_transform): No longer expect the 'lang_*_rewrite'
subroutines to return a 'LANG_*' constant, but only a transformed
extension, if required. To decide whether further processing of the
source file should be stopped, rely on a new set of 'lang_*_ignore'
subroutines, defaulting to a subroutine that returns false.
Accordingly, don't special case the handling of '.vapi' files anymore,
instead rely on ...
(lang_vala_ignore, lang_header_ignore): ... these new subroutines to
avoid extra processing of C/C++ headers and Vala '.vapi' headers.
(lang_java_rewrite): Remove.
Remove an outdated comment.
* lib/am/depend2.am: Partial rewrite to reduce code duplication and
drop use of the '%DEPBASE%' transform.
* t/compile_f_c_cxx.sh: Adjust.
Signed-off-by: Stefano Lattarini
---
bin/automake.in | 158 +++++++++++++++------------------------------------
lib/am/depend2.am | 33 ++++++-----
t/compile_f_c_cxx.sh | 7 ++-
3 files changed, 69 insertions(+), 129 deletions(-)
diff --git a/bin/automake.in b/bin/automake.in
index d730dac71..63e5962f4 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -178,13 +178,6 @@ my $gen_copyright = "\
# PARTICULAR PURPOSE.
";
-# These constants are returned by the lang_*_rewrite functions.
-# LANG_SUBDIR means that the resulting object file should be in a
-# subdir if the source file is. In this case the file name cannot
-# have '..' components.
-use constant LANG_IGNORE => 0;
-use constant LANG_SUBDIR => 2;
-
# These are used when keeping track of whether an object can be built
# by two different paths.
use constant COMPILE_LIBTOOL => 1;
@@ -708,7 +701,7 @@ register_language ('name' => 'header',
# Nothing to do.
'_finish' => sub { });
-# Vala
+# Vala.
register_language ('name' => 'vala',
'Name' => 'Vala',
'config_vars' => ['VALAC'],
@@ -716,9 +709,10 @@ register_language ('name' => 'vala',
'compile' => '$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS)',
'ccer' => 'VALAC',
'compiler' => 'VALACOMPILE',
- 'extensions' => ['.vala'],
- 'output_extensions' => sub { (my $ext = $_[0]) =~ s/vala$/c/;
- return ($ext,) },
+ 'extensions' => ['.vala', '.vapi'],
+ # Vala compilation must be handled in a special way, so
+ # nothing to do or return here.
+ 'output_extensions' => sub { },
'rule_file' => 'vala',
'_finish' => \&lang_vala_finish,
'_target_hook' => \&lang_vala_target_hook,
@@ -1312,26 +1306,13 @@ sub handle_languages ()
# This is not used by depend2.am.
my $der_ext = ($lang->output_extensions->($ext))[0];
- # When we output an inference rule like '.c.o:' we
- # have two cases to consider: either subdir-objects
- # is used, or it is not.
- #
- # In the latter case the rule is used to build objects
- # in the current directory, and dependencies always
- # go into './$(DEPDIR)/'. We can hard-code this value.
- #
- # In the former case the rule can be used to build
- # objects in sub-directories too. Dependencies should
- # go into the appropriate sub-directories, e.g.,
- # 'sub/$(DEPDIR)/'. The value of this directory
- # needs to be computed on-the-fly.
- #
- # DEPBASE holds the name of this directory, plus the
- # basename part of the object file (extensions Po, TPo,
- # Plo, TPlo will be added later as appropriate). It is
- # either hardcoded, or a shell variable ('$depbase') that
- # will be computed by the rule.
- my $depbase = '$$depbase';
+ # Even when subdir sources are present, an inference rule
+ # like '.c.o:' can be used to build corresponding objects
+ # in the sane subdirectory too. We should be careful to also
+ # place dependency files into the appropriate subdirectory,
+ # e.g., 'sub/$(DEPDIR)/'. The value of this directory needs
+ # to be computed on-the-fly (that is done by our makefile
+ # recipes in 'depend2.am').
$output_rules .=
file_contents ($rule_file,
new Automake::Location,
@@ -1340,7 +1321,6 @@ sub handle_languages ()
'DERIVED-EXT' => $der_ext,
- DEPBASE => $depbase,
BASE => '$*',
SOURCE => '$<',
SOURCEFLAG => $sourceflags{$ext} || '',
@@ -1397,20 +1377,12 @@ sub handle_languages ()
# We _need_ '-o' for per object rules.
my $output_flag = $lang->output_flag || '-o';
- my $depbase = dirname ($obj);
- $depbase = ''
- if $depbase eq '.';
- $depbase .= '/'
- unless $depbase eq '';
- $depbase .= '$(DEPDIR)/' . basename ($obj);
-
$output_rules .=
file_contents ($rule_file,
new Automake::Location,
%transform,
GENERIC => 0,
- DEPBASE => $depbase,
BASE => $obj,
SOURCE => $source,
SOURCEFLAG => $sourceflags{$srcext} || '',
@@ -1630,20 +1602,24 @@ sub handle_single_transform
}
}
- # Note: computed subr call. The language rewrite function
- # should return one of the LANG_* constants. It could
- # also return a list whose first value is such a constant
- # and whose second value is a new source extension which
- # should be applied. This means this particular language
- # generates another source file which we must then process
- # further.
- my $subr = \&{'lang_' . $lang->name . '_rewrite'};
- defined &$subr or $subr = sub { return LANG_SUBDIR; };
- my ($r, $source_extension)
- = &$subr ($directory, $base, $extension,
- $obj, $have_per_exec_flags, $var);
- # Skip this entry if we were asked not to process it.
- next if $r == LANG_IGNORE;
+ # NOTE: computed subr calls here.
+
+ # The language ignore function can ask not to preprocess
+ # a source file further.
+ my $subr_ignore = \&{'lang_' . $lang->name . '_ignore'};
+ next if defined &$subr_ignore
+ and &$subr_ignore ($directory, $base, $extension);
+ # The language rewrite function can return a new source
+ # extension which should be applied. This means this
+ # particular language generates another source file which
+ # we must then process further. This happens, for example,
+ # with yacc and lex.
+ my $subr_rewrite = \&{'lang_' . $lang->name . '_rewrite'};
+ $subr_rewrite = sub { } unless defined &$subr_rewrite;
+ my $source_extension = &$subr_rewrite ($directory, $base,
+ $extension, $obj,
+ $have_per_exec_flags,
+ $var);
# Now extract linker and other info.
$linker = $lang->linker;
@@ -1691,39 +1667,9 @@ sub handle_single_transform
$renamed = 1;
}
- # If rewrite said it was ok, put the object into a
- # subdir.
- if ($directory ne '')
- {
- if ($r == LANG_SUBDIR)
- {
- $object = $directory . '/' . $object;
- }
- else
- {
- # Since the next major version of automake (2.0) will
- # make the behaviour so far only activated with the
- # 'subdir-object' option mandatory, it's better if we
- # start warning users not using that option.
- # As suggested by Peter Johansson, we strive to avoid
- # the warning when it would be irrelevant, i.e., if
- # all source files sit in "current" directory.
- msg_var 'unsupported', $var,
- "source file '$full' is in a subdirectory,"
- . "\nbut option 'subdir-objects' is disabled";
- msg 'unsupported', INTERNAL, <<'EOF', uniq_scope => US_GLOBAL;
-possible forward-incompatibility.
-At least a source file is in a subdirectory, but the 'subdir-objects'
-automake option hasn't been enabled. For now, the corresponding output
-object file(s) will be placed in the top-level directory. However,
-this behaviour will change in future Automake versions: they will
-unconditionally cause object files to be placed in the same subdirectory
-of the corresponding sources.
-You are advised to start using 'subdir-objects' option throughout your
-project, to avoid future incompatibilities.
-EOF
- }
- }
+ # If rewrite said it was ok, put the object into a subdir.
+ $object = $directory . '/' . $object
+ unless $directory eq '';
# If the object file has been renamed (because per-target
# flags are used) we cannot compile the file with an
@@ -5440,40 +5386,37 @@ sub check_gnits_standards ()
#
# Functions to handle files of each language.
-# Each 'lang_X_rewrite($DIRECTORY, $BASE, $EXT)' function follows a
-# simple formula: Return value is LANG_SUBDIR if the resulting object
-# file should be in a subdir if the source file is, LANG_PROCESS if
-# file is to be dealt with, LANG_IGNORE otherwise.
-
# Much of the actual processing is handled in
# handle_single_transform. These functions exist so that
# auxiliary information can be recorded for a later cleanup pass.
# Note that the calls to these functions are computed, so don't bother
# searching for their precise names in the source.
-# Rewrite a single header file.
-sub lang_header_rewrite
+# Header files are simply ignored.
+sub lang_header_ignore { 1; }
+
+# Vala '.vapi' are a kind of header files as well, and should
+# not be processed into compilation rules.
+ sub lang_vala_ignore
{
- # Header files are simply ignored.
- return LANG_IGNORE;
+ my ($directory, $base, $ext) = @_;
+ return ($ext =~ m/\.vapi$/ ? 1 : 0);
}
# Rewrite a single Vala source file.
sub lang_vala_rewrite
{
my ($directory, $base, $ext) = @_;
-
- (my $newext = $ext) =~ s/vala$/c/;
- return (LANG_SUBDIR, $newext);
+ $ext =~ s/vala$/c/;
+ return $ext;
}
# Rewrite a single yacc/yacc++ file.
sub lang_yacc_rewrite
{
my ($directory, $base, $ext) = @_;
-
- (my $newext = $ext) =~ tr/y/c/;
- return (LANG_SUBDIR, $newext);
+ $ext =~ tr/y/c/;
+ return $ext;
}
sub lang_yaccxx_rewrite { lang_yacc_rewrite (@_); };
@@ -5481,18 +5424,11 @@ sub lang_yaccxx_rewrite { lang_yacc_rewrite (@_); };
sub lang_lex_rewrite
{
my ($directory, $base, $ext) = @_;
-
- (my $newext = $ext) =~ tr/l/c/;
- return (LANG_SUBDIR, $newext);
+ $ext =~ tr/l/c/;
+ return $ext;
}
sub lang_lexxx_rewrite { lang_lex_rewrite (@_); };
-# Rewrite a single Java file.
-sub lang_java_rewrite
-{
- return LANG_SUBDIR;
-}
-
# The lang_X_finish functions are called after all source file
# processing is done. Each should handle defining rules for the
# language, etc. A finish function is only called if a source file of
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index a13379afb..c727bd8b2 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -38,11 +38,12 @@ if %?NONLIBTOOL%
if %FASTDEP%
## In fast-dep mode, we can always use -o.
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? %VERBOSE%%COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
-?!GENERIC? %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
-?GENERIC? %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-?GENERIC? %COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJ% %SOURCEFLAG%%SOURCE% &&\
-?GENERIC? $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
+## TODO: rewrite this to avoid extra forks once we can assume a POSIX
+## TODO: shell.
+ %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'` \
+?!GENERIC? && %COMPILE% -MT %OBJ% -MD -MP -MF $$depbase.Tpo %-c% -o %OBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
+?GENERIC? && %COMPILE% -MT %OBJ% -MD -MP -MF $$depbase.Tpo %-c% -o %OBJ% %SOURCEFLAG%%SOURCE% \
+ && $(am__mv) $$depbase.Tpo $$depbase.Po
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
@@ -63,11 +64,12 @@ endif !%FASTDEP%
if %FASTDEP%
## In fast-dep mode, we can always use -o.
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? %VERBOSE%%COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJOBJ% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
-?!GENERIC? %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
-?GENERIC? %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-?GENERIC? %COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'` &&\
-?GENERIC? $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po
+## TODO: rewrite this to avoid extra forks once we can assume a POSIX
+## TODO: shell.
+ %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'` \
+?!GENERIC? && %COMPILE% -MT %OBJOBJ% -MD -MP -MF $$depbase.Tpo %-c% -o %OBJOBJ% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi` \
+?GENERIC? && %COMPILE% -MT %OBJOBJ% -MD -MP -MF $$depbase.Tpo %-c% -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'` \
+ && $(am__mv) $$depbase.Tpo $$depbase.Po
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
@@ -90,11 +92,12 @@ if %?LIBTOOL%
if %FASTDEP%
## In fast-dep mode, we can always use -o.
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? %VERBOSE%%LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %LTOBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
-?!GENERIC? %SILENT%$(am__mv) %DEPBASE%.Tpo %DEPBASE%.Plo
-?GENERIC? %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-?GENERIC? %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE% &&\
-?GENERIC? $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Plo
+## TODO: rewrite this to avoid extra forks once we can assume a POSIX
+## TODO: shell.
+ %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'` \
+?!GENERIC? && %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF $$depbase.Tpo %-c% -o %LTOBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
+?GENERIC? && %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF $$depbase.Tpo %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE% \
+ && $(am__mv) $$depbase.Tpo $$depbase.Plo
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
diff --git a/t/compile_f_c_cxx.sh b/t/compile_f_c_cxx.sh
index 2562d7da0..4b9189d61 100755
--- a/t/compile_f_c_cxx.sh
+++ b/t/compile_f_c_cxx.sh
@@ -41,12 +41,13 @@ $AUTOMAKE
$FGREP COMPILE Makefile.in # For debugging.
# Look for the macros at the beginning of rules.
-sed < Makefile.in > mk \
+
+sed -e "s|$tab *&& *|$tab|" \
-e 's|$(AM_V_CC)||g' \
-e 's|$(AM_V_CXX)||g' \
- -e 's|$(AM_V_F77)||g'
+ -e 's|$(AM_V_F77)||g' \
+ Makefile.in >mk
diff -u Makefile.in mk || : # For debugging.
-
$FGREP "$tab\$(COMPILE)" mk
$FGREP "$tab\$(CXXCOMPILE)" mk
$FGREP "$tab\$(F77COMPILE)" mk
--
cgit v1.2.1
From 7299c4d24b98b92c8bb9d17d146b46777ab12953 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Thu, 10 Jan 2013 19:38:58 +0100
Subject: depend: assume we can always pass '-o' to the C compiler
This is the case after the change in commit v1.13.1-56-g34001a9 of
2013-01-09 (compile: use 'compile' script when "-c -o" is used with
losing compilers).
This is just a simplification; no semantic changes are intended.
* bin/automake.in (handle_languages): Drop transform '%-o%', and
definitions of '$output_flag'.
* lib/am/depend2.am: Adjust to just assume the '?-o?' transform is
true, and the '%-o%' transform expands to "-o".
Signed-off-by: Stefano Lattarini
---
bin/automake.in | 12 +-----------
lib/am/depend2.am | 16 ++++------------
2 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/bin/automake.in b/bin/automake.in
index 63e5962f4..df6560d3a 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1296,12 +1296,6 @@ sub handle_languages ()
if (((! option 'no-dependencies') && $lang->autodep ne 'no')
|| defined $lang->compile)
{
- # Some C compilers don't support -c -o. Use it only if really
- # needed.
- my $output_flag = $lang->output_flag || '';
- $output_flag = '-o'
- if (! $output_flag && $lang->name eq 'c');
-
# Compute a possible derived extension.
# This is not used by depend2.am.
my $der_ext = ($lang->output_extensions->($ext))[0];
@@ -1330,7 +1324,7 @@ sub handle_languages ()
COMPILE => '$(' . $lang->compiler . ')',
LTCOMPILE => '$(LT' . $lang->compiler . ')',
- -o => $output_flag);
+ );
}
# Now include code for each specially handled object with this
@@ -1374,9 +1368,6 @@ sub handle_languages ()
"\$(LIBTOOL) $ltverbose $libtool_tag\$($ptltflags) \$(LIBTOOLFLAGS) "
. "--mode=compile $obj_compile";
- # We _need_ '-o' for per object rules.
- my $output_flag = $lang->output_flag || '-o';
-
$output_rules .=
file_contents ($rule_file,
new Automake::Location,
@@ -1398,7 +1389,6 @@ sub handle_languages ()
SILENT => $silent,
COMPILE => $obj_compile,
LTCOMPILE => $obj_ltcompile,
- -o => $output_flag,
%file_transform);
}
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index c727bd8b2..d3a8763fa 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -36,7 +36,6 @@ if %?NONLIBTOOL%
?GENERIC?%EXT%.o:
?!GENERIC?%OBJ%: %SOURCE%
if %FASTDEP%
-## In fast-dep mode, we can always use -o.
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
## TODO: rewrite this to avoid extra forks once we can assume a POSIX
## TODO: shell.
@@ -50,19 +49,16 @@ if %AMDEP%
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
if %?GENERIC%
-?-o? %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJ% %SOURCEFLAG%%SOURCE%
-?!-o? %VERBOSE-NODEP%%COMPILE% %-c% %SOURCEFLAG%%SOURCE%
+ %VERBOSE-NODEP%%COMPILE% %-c% -o %OBJ% %SOURCEFLAG%%SOURCE%
else !%?GENERIC%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?-o? %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
-?!-o? %VERBOSE-NODEP%%COMPILE% %-c% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+ %VERBOSE-NODEP%%COMPILE% %-c% -o %OBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
endif !%?GENERIC%
endif !%FASTDEP%
?GENERIC?%EXT%.obj:
?!GENERIC?%OBJOBJ%: %SOURCE%
if %FASTDEP%
-## In fast-dep mode, we can always use -o.
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
## TODO: rewrite this to avoid extra forks once we can assume a POSIX
## TODO: shell.
@@ -76,12 +72,10 @@ if %AMDEP%
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
if %?GENERIC%
-?-o? %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'`
-?!-o? %VERBOSE-NODEP%%COMPILE% %-c% `$(CYGPATH_W) %SOURCEFLAG%'%SOURCE%'`
+ %VERBOSE-NODEP%%COMPILE% %-c% -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'`
else !%?GENERIC%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?-o? %VERBOSE-NODEP%%COMPILE% %-c% %-o% %OBJOBJ% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
-?!-o? %VERBOSE-NODEP%%COMPILE% %-c% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
+ %VERBOSE-NODEP%%COMPILE% %-c% -o %OBJOBJ% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
endif !%?GENERIC%
endif !%FASTDEP%
endif %?NONLIBTOOL%
@@ -90,7 +84,6 @@ if %?LIBTOOL%
?GENERIC?%EXT%.lo:
?!GENERIC?%LTOBJ%: %SOURCE%
if %FASTDEP%
-## In fast-dep mode, we can always use -o.
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
## TODO: rewrite this to avoid extra forks once we can assume a POSIX
## TODO: shell.
@@ -103,7 +96,6 @@ if %AMDEP%
%VERBOSE%source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
-## We can always use '-o' with Libtool.
?GENERIC? %VERBOSE-NODEP%%LTCOMPILE% %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
?!GENERIC? %VERBOSE-NODEP%%LTCOMPILE% %-c% -o %LTOBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
--
cgit v1.2.1
From 20d337a7dfacfbd98174105d76528dab3b561bee Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Thu, 10 Jan 2013 19:48:14 +0100
Subject: depend: assume '-c' compiler flag always means to produce object
files
Rather than fully-fledged executables. This is the case for all the
compilers of all languages supported by Automake.
This is just a simplification; no semantic changes are intended.
* bin/automake.in (handle_languages): Drop transform '%-c%'.
* lib/am/depend2.am: Adjust to just assume the '%-c%' transform
expands to "-c".
Signed-off-by: Stefano Lattarini
---
bin/automake.in | 1 -
lib/am/depend2.am | 24 ++++++++++++------------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/bin/automake.in b/bin/automake.in
index df6560d3a..23fb215c4 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1282,7 +1282,6 @@ sub handle_languages ()
'FPFX' => $fpfx,
'AMDEP' => $AMDEP,
'FASTDEP' => $FASTDEP,
- '-c' => $lang->compile_flag || '',
# These are not used, but they need to be defined
# so transform() does not complain.
'DERIVED-EXT' => 'BUG',
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index d3a8763fa..99e993b00 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -40,8 +40,8 @@ if %FASTDEP%
## TODO: rewrite this to avoid extra forks once we can assume a POSIX
## TODO: shell.
%VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'` \
-?!GENERIC? && %COMPILE% -MT %OBJ% -MD -MP -MF $$depbase.Tpo %-c% -o %OBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
-?GENERIC? && %COMPILE% -MT %OBJ% -MD -MP -MF $$depbase.Tpo %-c% -o %OBJ% %SOURCEFLAG%%SOURCE% \
+?!GENERIC? && %COMPILE% -MT %OBJ% -MD -MP -MF $$depbase.Tpo -c -o %OBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
+?GENERIC? && %COMPILE% -MT %OBJ% -MD -MP -MF $$depbase.Tpo -c -o %OBJ% %SOURCEFLAG%%SOURCE% \
&& $(am__mv) $$depbase.Tpo $$depbase.Po
else !%FASTDEP%
if %AMDEP%
@@ -49,10 +49,10 @@ if %AMDEP%
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
if %?GENERIC%
- %VERBOSE-NODEP%%COMPILE% %-c% -o %OBJ% %SOURCEFLAG%%SOURCE%
+ %VERBOSE-NODEP%%COMPILE% -c -o %OBJ% %SOURCEFLAG%%SOURCE%
else !%?GENERIC%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
- %VERBOSE-NODEP%%COMPILE% %-c% -o %OBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+ %VERBOSE-NODEP%%COMPILE% -c -o %OBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
endif !%?GENERIC%
endif !%FASTDEP%
@@ -63,8 +63,8 @@ if %FASTDEP%
## TODO: rewrite this to avoid extra forks once we can assume a POSIX
## TODO: shell.
%VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'` \
-?!GENERIC? && %COMPILE% -MT %OBJOBJ% -MD -MP -MF $$depbase.Tpo %-c% -o %OBJOBJ% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi` \
-?GENERIC? && %COMPILE% -MT %OBJOBJ% -MD -MP -MF $$depbase.Tpo %-c% -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'` \
+?!GENERIC? && %COMPILE% -MT %OBJOBJ% -MD -MP -MF $$depbase.Tpo -c -o %OBJOBJ% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi` \
+?GENERIC? && %COMPILE% -MT %OBJOBJ% -MD -MP -MF $$depbase.Tpo -c -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'` \
&& $(am__mv) $$depbase.Tpo $$depbase.Po
else !%FASTDEP%
if %AMDEP%
@@ -72,10 +72,10 @@ if %AMDEP%
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
if %?GENERIC%
- %VERBOSE-NODEP%%COMPILE% %-c% -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'`
+ %VERBOSE-NODEP%%COMPILE% -c -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'`
else !%?GENERIC%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
- %VERBOSE-NODEP%%COMPILE% %-c% -o %OBJOBJ% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
+ %VERBOSE-NODEP%%COMPILE% -c -o %OBJOBJ% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
endif !%?GENERIC%
endif !%FASTDEP%
endif %?NONLIBTOOL%
@@ -88,16 +88,16 @@ if %FASTDEP%
## TODO: rewrite this to avoid extra forks once we can assume a POSIX
## TODO: shell.
%VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'` \
-?!GENERIC? && %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF $$depbase.Tpo %-c% -o %LTOBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
-?GENERIC? && %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF $$depbase.Tpo %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE% \
+?!GENERIC? && %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF $$depbase.Tpo -c -o %LTOBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
+?GENERIC? && %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF $$depbase.Tpo -c -o %LTOBJ% %SOURCEFLAG%%SOURCE% \
&& $(am__mv) $$depbase.Tpo $$depbase.Plo
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
-?GENERIC? %VERBOSE-NODEP%%LTCOMPILE% %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE%
+?GENERIC? %VERBOSE-NODEP%%LTCOMPILE% -c -o %LTOBJ% %SOURCEFLAG%%SOURCE%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? %VERBOSE-NODEP%%LTCOMPILE% %-c% -o %LTOBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?!GENERIC? %VERBOSE-NODEP%%LTCOMPILE% -c -o %LTOBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
endif !%FASTDEP%
endif %?LIBTOOL%
--
cgit v1.2.1
From 9fabb5e4520f583f18cdb80b4b7b55c7f5ba856c Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Thu, 10 Jan 2013 19:54:13 +0100
Subject: Automake::Language: drop unused fields 'compile_flag' and
'output_flag'
They are unused after the recent flurry of changes. This is just a
simplification; no semantic change is intended.
* lib/Automake/Language.pm (Class::Struct): Remove unused fields here.
* bin/automake.in: And here, in all the 'register_language()' invocations.
Signed-off-by: Stefano Lattarini
---
bin/automake.in | 25 -------------------------
lib/Automake/Language.pm | 4 ----
2 files changed, 29 deletions(-)
diff --git a/bin/automake.in b/bin/automake.in
index 23fb215c4..c87acba72 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -614,7 +614,6 @@ register_language ('name' => 'c',
'ld' => '$(CC)',
'linker' => 'LINK',
'link' => '$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
- 'compile_flag' => '-c',
'libtool_tag' => 'CC',
'extensions' => ['.c']);
@@ -629,8 +628,6 @@ register_language ('name' => 'cxx',
'compile' => "\$(CXX) @cpplike_flags \$(AM_CXXFLAGS) \$(CXXFLAGS)",
'ccer' => 'CXX',
'compiler' => 'CXXCOMPILE',
- 'compile_flag' => '-c',
- 'output_flag' => '-o',
'libtool_tag' => 'CXX',
'lder' => 'CXXLD',
'ld' => '$(CXX)',
@@ -648,8 +645,6 @@ register_language ('name' => 'objc',
'compile' => "\$(OBJC) @cpplike_flags \$(AM_OBJCFLAGS) \$(OBJCFLAGS)",
'ccer' => 'OBJC',
'compiler' => 'OBJCCOMPILE',
- 'compile_flag' => '-c',
- 'output_flag' => '-o',
'lder' => 'OBJCLD',
'ld' => '$(OBJC)',
'pure' => 1,
@@ -666,8 +661,6 @@ register_language ('name' => 'objcxx',
'compile' => "\$(OBJCXX) @cpplike_flags \$(AM_OBJCXXFLAGS) \$(OBJCXXFLAGS)",
'ccer' => 'OBJCXX',
'compiler' => 'OBJCXXCOMPILE',
- 'compile_flag' => '-c',
- 'output_flag' => '-o',
'lder' => 'OBJCXXLD',
'ld' => '$(OBJCXX)',
'pure' => 1,
@@ -684,8 +677,6 @@ register_language ('name' => 'upc',
'compile' => "\$(UPC) @cpplike_flags \$(AM_UPCFLAGS) \$(UPCFLAGS)",
'ccer' => 'UPC',
'compiler' => 'UPCCOMPILE',
- 'compile_flag' => '-c',
- 'output_flag' => '-o',
'lder' => 'UPCLD',
'ld' => '$(UPC)',
'pure' => 1,
@@ -790,8 +781,6 @@ register_language ('name' => 'asm',
'compile' => '$(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)',
'ccer' => 'CCAS',
'compiler' => 'CCASCOMPILE',
- 'compile_flag' => '-c',
- 'output_flag' => '-o',
'extensions' => ['.s']);
# Preprocessed Assembler.
@@ -804,8 +793,6 @@ register_language ('name' => 'cppasm',
'compile' => "\$(CCAS) @cpplike_flags \$(AM_CCASFLAGS) \$(CCASFLAGS)",
'ccer' => 'CPPAS',
'compiler' => 'CPPASCOMPILE',
- 'compile_flag' => '-c',
- 'output_flag' => '-o',
'extensions' => ['.S', '.sx']);
# Fortran 77
@@ -818,8 +805,6 @@ register_language ('name' => 'f77',
'compile' => '$(F77) $(AM_FFLAGS) $(FFLAGS)',
'ccer' => 'F77',
'compiler' => 'F77COMPILE',
- 'compile_flag' => '-c',
- 'output_flag' => '-o',
'libtool_tag' => 'F77',
'lder' => 'F77LD',
'ld' => '$(F77)',
@@ -836,8 +821,6 @@ register_language ('name' => 'fc',
'compile' => '$(FC) $(AM_FCFLAGS) $(FCFLAGS)',
'ccer' => 'FC',
'compiler' => 'FCCOMPILE',
- 'compile_flag' => '-c',
- 'output_flag' => '-o',
'libtool_tag' => 'FC',
'lder' => 'FCLD',
'ld' => '$(FC)',
@@ -856,8 +839,6 @@ register_language ('name' => 'ppfc',
'ccer' => 'PPFC',
'compiler' => 'PPFCCOMPILE',
'compile' => "\$(FC) @cpplike_flags \$(AM_FCFLAGS) \$(FCFLAGS)",
- 'compile_flag' => '-c',
- 'output_flag' => '-o',
'libtool_tag' => 'FC',
'pure' => 1,
'extensions' => ['.F90','.F95', '.F03', '.F08']);
@@ -888,8 +869,6 @@ register_language ('name' => 'ppf77',
'ccer' => 'PPF77',
'compiler' => 'PPF77COMPILE',
'compile' => "\$(F77) @cpplike_flags \$(AM_FFLAGS) \$(FFLAGS)",
- 'compile_flag' => '-c',
- 'output_flag' => '-o',
'libtool_tag' => 'F77',
'pure' => 1,
'extensions' => ['.F']);
@@ -907,8 +886,6 @@ register_language ('name' => 'ratfor',
'compile' => '$(F77) $(AM_FFLAGS) $(FFLAGS) $(AM_RFLAGS) $(RFLAGS)',
'ccer' => 'F77',
'compiler' => 'RCOMPILE',
- 'compile_flag' => '-c',
- 'output_flag' => '-o',
'libtool_tag' => 'F77',
'pure' => 1,
'extensions' => ['.r']);
@@ -924,8 +901,6 @@ register_language ('name' => 'java',
'compile' => '$(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)',
'ccer' => 'GCJ',
'compiler' => 'GCJCOMPILE',
- 'compile_flag' => '-c',
- 'output_flag' => '-o',
'libtool_tag' => 'GCJ',
'lder' => 'GCJLD',
'ld' => '$(GCJ)',
diff --git a/lib/Automake/Language.pm b/lib/Automake/Language.pm
index a678e1e4d..68fbccf5d 100644
--- a/lib/Automake/Language.pm
+++ b/lib/Automake/Language.pm
@@ -39,8 +39,6 @@ Class::Struct::struct (
'compiler' => "\$",
# Content of the compiling variable.
'compile' => "\$",
- # Flag to require compilation without linking (-c).
- 'compile_flag' => "\$",
'extensions' => '@',
# A subroutine to compute a list of possible extensions of
# the product given the input extensions.
@@ -70,8 +68,6 @@ Class::Struct::struct (
# Content of the linker variable ($(CC)).
'ld' => "\$",
- # Flag to specify the output file (-o).
- 'output_flag' => "\$",
'_finish' => "\$",
# This is a subroutine which is called whenever we finally
--
cgit v1.2.1
From 1fa0c24dbbfcdec1eccd8bd3242ae9ef20ff1ddb Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Thu, 10 Jan 2013 18:04:33 +0100
Subject: depend: refactor and remove code duplication
* lib/am/depend2.am: Here. The obsolescent comments removed from this
same file in commit 'v1.13.1-42-g8f06bfb' of 2012-01-09, "depend2.am: fix
comments on verbosity of compilation rules", gave the rationale for why
that code duplication was there in the first place (rationale that, like
those comments, has been obsolete by the silent-rules introduction).
* bin/automake.in: Given the refactoring in 'depend2.am', there is no
longer need to add extra trailing whitespace to the entries of the
'%sourceflags' hash (which are used for the '%SOURCEFLAG%' transform
when 'depend2.am' is processed.
* t/fort2.sh: Adjust to avoid spurious failures.
Signed-off-by: Stefano Lattarini
---
bin/automake.in | 4 +---
lib/am/depend2.am | 46 ++++++++++++++++++++++++----------------------
t/fort2.sh | 13 +++++++++++--
3 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/bin/automake.in b/bin/automake.in
index c87acba72..04906b3f3 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -5060,9 +5060,7 @@ sub scan_autoconf_traces
elsif ($macro eq 'AC_FC_SRCEXT')
{
my $suffix = $args[1];
- # These flags are used as %SOURCEFLAG% in depend2.am,
- # where the trailing space is important.
- $sourceflags{'.' . $suffix} = '$(FCFLAGS_' . $suffix . ') '
+ $sourceflags{'.' . $suffix} = '$(FCFLAGS_' . $suffix . ')'
if ($suffix eq 'f90' || $suffix eq 'f95' || $suffix eq 'f03' || $suffix eq 'f08');
}
elsif ($macro eq 'AC_INIT')
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 99e993b00..6c6c6843b 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -36,47 +36,47 @@ if %?NONLIBTOOL%
?GENERIC?%EXT%.o:
?!GENERIC?%OBJ%: %SOURCE%
if %FASTDEP%
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
## TODO: rewrite this to avoid extra forks once we can assume a POSIX
## TODO: shell.
%VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'` \
-?!GENERIC? && %COMPILE% -MT %OBJ% -MD -MP -MF $$depbase.Tpo -c -o %OBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
-?GENERIC? && %COMPILE% -MT %OBJ% -MD -MP -MF $$depbase.Tpo -c -o %OBJ% %SOURCEFLAG%%SOURCE% \
- && $(am__mv) $$depbase.Tpo $$depbase.Po
+ && %COMPILE% -MT %OBJ% -MD -MP -MF $$depbase.Tpo -c -o %OBJ% %SOURCEFLAG% \
+?GENERIC? %SOURCE% \
+## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
+?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
+ && $(am__mv) $$depbase.Tpo $$depbase.Po
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
-if %?GENERIC%
- %VERBOSE-NODEP%%COMPILE% -c -o %OBJ% %SOURCEFLAG%%SOURCE%
-else !%?GENERIC%
+ %VERBOSE-NODEP%%COMPILE% -c -o %OBJ% %SOURCEFLAG% \
+?GENERIC? %SOURCE%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
- %VERBOSE-NODEP%%COMPILE% -c -o %OBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
-endif !%?GENERIC%
+?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
endif !%FASTDEP%
?GENERIC?%EXT%.obj:
?!GENERIC?%OBJOBJ%: %SOURCE%
if %FASTDEP%
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
## TODO: rewrite this to avoid extra forks once we can assume a POSIX
## TODO: shell.
%VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'` \
-?!GENERIC? && %COMPILE% -MT %OBJOBJ% -MD -MP -MF $$depbase.Tpo -c -o %OBJOBJ% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi` \
-?GENERIC? && %COMPILE% -MT %OBJOBJ% -MD -MP -MF $$depbase.Tpo -c -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'` \
+ && %COMPILE% -MT %OBJOBJ% -MD -MP -MF $$depbase.Tpo -c -o %OBJOBJ% %SOURCEFLAG% \
+?GENERIC? `$(CYGPATH_W) '%SOURCE%'` \
+## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
+?!GENERIC? `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
+?!GENERIC? else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi` \
&& $(am__mv) $$depbase.Tpo $$depbase.Po
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
-if %?GENERIC%
- %VERBOSE-NODEP%%COMPILE% -c -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'`
-else !%?GENERIC%
+ %VERBOSE-NODEP%%COMPILE% -c -o %OBJOBJ% %SOURCEFLAG% \
+?GENERIC? `$(CYGPATH_W) '%SOURCE%'`
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
- %VERBOSE-NODEP%%COMPILE% -c -o %OBJOBJ% %SOURCEFLAG%`if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
-endif !%?GENERIC%
+?!GENERIC? `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
+?!GENERIC? else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
endif !%FASTDEP%
endif %?NONLIBTOOL%
@@ -84,20 +84,22 @@ if %?LIBTOOL%
?GENERIC?%EXT%.lo:
?!GENERIC?%LTOBJ%: %SOURCE%
if %FASTDEP%
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
## TODO: rewrite this to avoid extra forks once we can assume a POSIX
## TODO: shell.
%VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'` \
-?!GENERIC? && %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF $$depbase.Tpo -c -o %LTOBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
-?GENERIC? && %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF $$depbase.Tpo -c -o %LTOBJ% %SOURCEFLAG%%SOURCE% \
+ && %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF $$depbase.Tpo -c -o %LTOBJ% %SOURCEFLAG% \
+?GENERIC? %SOURCE% \
+## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
+?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
&& $(am__mv) $$depbase.Tpo $$depbase.Plo
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
-?GENERIC? %VERBOSE-NODEP%%LTCOMPILE% -c -o %LTOBJ% %SOURCEFLAG%%SOURCE%
+ %VERBOSE-NODEP%%LTCOMPILE% -c -o %LTOBJ% %SOURCEFLAG% \
+?GENERIC? %SOURCE%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? %VERBOSE-NODEP%%LTCOMPILE% -c -o %LTOBJ% %SOURCEFLAG%`test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
endif !%FASTDEP%
endif %?LIBTOOL%
diff --git a/t/fort2.sh b/t/fort2.sh
index d61445296..bed032368 100755
--- a/t/fort2.sh
+++ b/t/fort2.sh
@@ -70,8 +70,17 @@ $MAKE -n \
FCFLAGS_f90=--@90 FCFLAGS_f95=--@95 FCFLAGS_f03=--@03 FCFLAGS_f08=--@08 \
> stdout || { cat stdout; exit 1; }
cat stdout
-# To make it easier to have stricter grepping below.
-sed -e 's/[ ][ ]*/ /g' -e 's/^/ /' -e 's/$/ /' stdout > out
+# To make it easier to have stricter grepping below.
+$PERL -e '
+ undef $/;
+ $_ = <>;
+ s/[^\\]\\\n/ /g;
+ s/^/ /;
+ s/\n/ \n /g;
+ s/[ \t]+/ /g;
+ s/\n\s*\z/\n/;
+ print;
+' out
cat out
grep ' fake-fc .* --@90 .* hello\.f90 ' out
--
cgit v1.2.1
From 27a6abf4b952e0489dcf87f0770c2b207b733f73 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Thu, 10 Jan 2013 20:47:57 +0100
Subject: depend: a preparatory refactoring
This is just a preparatory change in view of a future refactoring.
No semantic change is intended.
* lib/am/depend2.am: Adjust; for example, using '$@' in all recipes
to indicate the output file (rather than recipe-specific transforms
like '%OBJ%' and '%LTOBJ%'), and not assuming to know the exact
file extension of the output file (e.g., whether it's '.o' or '.lo').
Signed-off-by: Stefano Lattarini
---
lib/am/depend2.am | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 6c6c6843b..a54fcd35f 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -38,18 +38,18 @@ if %?NONLIBTOOL%
if %FASTDEP%
## TODO: rewrite this to avoid extra forks once we can assume a POSIX
## TODO: shell.
- %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'` \
- && %COMPILE% -MT %OBJ% -MD -MP -MF $$depbase.Tpo -c -o %OBJ% %SOURCEFLAG% \
+ %VERBOSE%depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.[^.]*$$||'` \
+ && %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% \
?GENERIC? %SOURCE% \
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
&& $(am__mv) $$depbase.Tpo $$depbase.Po
else !%FASTDEP%
if %AMDEP%
- %VERBOSE%source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
+ %VERBOSE%source='%SOURCE%' object='$@' libtool=no @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
- %VERBOSE-NODEP%%COMPILE% -c -o %OBJ% %SOURCEFLAG% \
+ %VERBOSE-NODEP%%COMPILE% -c -o $@ %SOURCEFLAG% \
?GENERIC? %SOURCE%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
@@ -60,8 +60,8 @@ endif !%FASTDEP%
if %FASTDEP%
## TODO: rewrite this to avoid extra forks once we can assume a POSIX
## TODO: shell.
- %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'` \
- && %COMPILE% -MT %OBJOBJ% -MD -MP -MF $$depbase.Tpo -c -o %OBJOBJ% %SOURCEFLAG% \
+ %VERBOSE%depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.[^.]*$$||'` \
+ && %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% \
?GENERIC? `$(CYGPATH_W) '%SOURCE%'` \
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
?!GENERIC? `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
@@ -69,10 +69,10 @@ if %FASTDEP%
&& $(am__mv) $$depbase.Tpo $$depbase.Po
else !%FASTDEP%
if %AMDEP%
- %VERBOSE%source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
+ %VERBOSE%source='%SOURCE%' object='$@' libtool=no @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
- %VERBOSE-NODEP%%COMPILE% -c -o %OBJOBJ% %SOURCEFLAG% \
+ %VERBOSE-NODEP%%COMPILE% -c -o $@ %SOURCEFLAG% \
?GENERIC? `$(CYGPATH_W) '%SOURCE%'`
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
?!GENERIC? `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
@@ -86,18 +86,18 @@ if %?LIBTOOL%
if %FASTDEP%
## TODO: rewrite this to avoid extra forks once we can assume a POSIX
## TODO: shell.
- %VERBOSE%depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'` \
- && %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF $$depbase.Tpo -c -o %LTOBJ% %SOURCEFLAG% \
+ %VERBOSE%depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.[^.]*$$||'` \
+ && %LTCOMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% \
?GENERIC? %SOURCE% \
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
&& $(am__mv) $$depbase.Tpo $$depbase.Plo
else !%FASTDEP%
if %AMDEP%
- %VERBOSE%source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
+ %VERBOSE%source='%SOURCE%' object='$@' libtool=yes @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
- %VERBOSE-NODEP%%LTCOMPILE% -c -o %LTOBJ% %SOURCEFLAG% \
+ %VERBOSE-NODEP%%LTCOMPILE% -c -o $@ %SOURCEFLAG% \
?GENERIC? %SOURCE%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
--
cgit v1.2.1
From 13abbe06ca25c31f011dc3deba21330ca0d7e8ad Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Thu, 10 Jan 2013 21:31:57 +0100
Subject: depend: reduce code duplication
Just a simplification; no semantic change is intended.
* lib/am/depend2.am (am__set_depbase): New. Use it in all the three
flavours of recipes (.o, .obj, .lo), instead of duplicating its code.
Signed-off-by: Stefano Lattarini
---
lib/am/depend2.am | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index a54fcd35f..5522aa36a 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -32,13 +32,16 @@
## a package with gcc 3.x or later. In this case we can skip the use of
## depcomp and easily inline the dependency tracking.
+if %?FIRST%
+## TODO: rewrite this to avoid extra forks once we can assume a POSIX shell.
+am__set_depbase = depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.[^.]*$$||'`
+endif %?FIRST%
+
if %?NONLIBTOOL%
?GENERIC?%EXT%.o:
?!GENERIC?%OBJ%: %SOURCE%
if %FASTDEP%
-## TODO: rewrite this to avoid extra forks once we can assume a POSIX
-## TODO: shell.
- %VERBOSE%depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.[^.]*$$||'` \
+ %VERBOSE%$(am__set_depbase) \
&& %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% \
?GENERIC? %SOURCE% \
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
@@ -58,9 +61,7 @@ endif !%FASTDEP%
?GENERIC?%EXT%.obj:
?!GENERIC?%OBJOBJ%: %SOURCE%
if %FASTDEP%
-## TODO: rewrite this to avoid extra forks once we can assume a POSIX
-## TODO: shell.
- %VERBOSE%depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.[^.]*$$||'` \
+ %VERBOSE%$(am__set_depbase) \
&& %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% \
?GENERIC? `$(CYGPATH_W) '%SOURCE%'` \
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
@@ -84,9 +85,7 @@ if %?LIBTOOL%
?GENERIC?%EXT%.lo:
?!GENERIC?%LTOBJ%: %SOURCE%
if %FASTDEP%
-## TODO: rewrite this to avoid extra forks once we can assume a POSIX
-## TODO: shell.
- %VERBOSE%depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.[^.]*$$||'` \
+ %VERBOSE%$(am__set_depbase) \
&& %LTCOMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% \
?GENERIC? %SOURCE% \
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
--
cgit v1.2.1
From 436cb17eabc2758faec17e2922547a5794a45f57 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Thu, 10 Jan 2013 21:42:28 +0100
Subject: depend: prefer $(...) over `...` in Cygwin-specific recipes
On Cygwin, we can happily assume only POSIX-conforming shells exist.
This commit is useless by itself, but is useful as a preparatory
refactoring in view of a future change.
* lib/am/depend2.am: In recipes for producing '.obj' objects, use
the POSIX form $(...) for command substitution, rather than the
classic Bourne one `...`.
Signed-off-by: Stefano Lattarini
---
lib/am/depend2.am | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 5522aa36a..a947ee7b6 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -63,10 +63,10 @@ endif !%FASTDEP%
if %FASTDEP%
%VERBOSE%$(am__set_depbase) \
&& %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% \
-?GENERIC? `$(CYGPATH_W) '%SOURCE%'` \
+?GENERIC? $$($(CYGPATH_W) '%SOURCE%') \
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
-?!GENERIC? else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi` \
+?!GENERIC? $$(if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
+?!GENERIC? else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi) \
&& $(am__mv) $$depbase.Tpo $$depbase.Po
else !%FASTDEP%
if %AMDEP%
@@ -74,10 +74,10 @@ if %AMDEP%
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
%VERBOSE-NODEP%%COMPILE% -c -o $@ %SOURCEFLAG% \
-?GENERIC? `$(CYGPATH_W) '%SOURCE%'`
+?GENERIC? $$($(CYGPATH_W) '%SOURCE%')
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
-?!GENERIC? else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
+?!GENERIC? $$(if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
+?!GENERIC? else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi)
endif !%FASTDEP%
endif %?NONLIBTOOL%
--
cgit v1.2.1
From c2bdb2a09870aeeed526dd8d8b2a74be6d4b623b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Thu, 16 May 2013 13:48:19 +0200
Subject: tests: remove remaining exec bits ('master' branch)
The executable bit gives the impression that the tests are directly
runnable, as with "./t/foo.sh", but it has been a while since that
was the case. Today, tests are runnable only through "make check"
or "./runtest".
This change is for the 'master' branch (automake 1.99a), and is a
follow-up to commit 'v1.13.2-3-g74017b5', done on the 'micro' branch
(automake 1.13.2a) and to commit 'v1.13.2-221-g0985d67', done on the
'maint' branch (automake 1.13a).
* t/am-prog-mkdir-p.sh: Remove executable bit.
* t/txinfo-no-split.sh: Likewise.
Signed-off-by: Stefano Lattarini
---
t/am-prog-mkdir-p.sh | 0
t/txinfo-no-split.sh | 0
2 files changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 t/am-prog-mkdir-p.sh
mode change 100755 => 100644 t/txinfo-no-split.sh
diff --git a/t/am-prog-mkdir-p.sh b/t/am-prog-mkdir-p.sh
old mode 100755
new mode 100644
diff --git a/t/txinfo-no-split.sh b/t/txinfo-no-split.sh
old mode 100755
new mode 100644
--
cgit v1.2.1
From ca41efd3e14a9523e4e0cc1d9689eb30b6b7045a Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Thu, 10 Jan 2013 21:52:18 +0100
Subject: depend: reduce code duplication, de-uglify make verbose output
Verbose output from compilation recipes had been made more messy by
the previous "simplifying" commit v1.13.1d-220-g1fa0c24. With this
patch, not only we reduce some code duplication, but also improve
that output again, for the joy of users who dislike silent-rules :-)
* lib/am/depend2.am: Use the new '%XSOURCE%' transform, instead of
copying and pasting the idiom for VPATH rewrite emulation over and
over. Fix some indentation and line-wrapping issues while at it.
* bin/automake.in (handle_languages): Implement the new transform.
* t/silent-nested-vars.sh: Adjust to avoid spurious failures.
Signed-off-by: Stefano Lattarini
---
bin/automake.in | 5 +++++
lib/am/depend2.am | 44 ++++++++++++--------------------------------
t/silent-nested-vars.sh | 2 +-
3 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/bin/automake.in b/bin/automake.in
index 04906b3f3..f51cfa770 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1291,6 +1291,7 @@ sub handle_languages ()
BASE => '$*',
SOURCE => '$<',
+ XSOURCE => '$<',
SOURCEFLAG => $sourceflags{$ext} || '',
OBJ => '$@',
OBJOBJ => '$@',
@@ -1342,6 +1343,9 @@ sub handle_languages ()
"\$(LIBTOOL) $ltverbose $libtool_tag\$($ptltflags) \$(LIBTOOLFLAGS) "
. "--mode=compile $obj_compile";
+ # For non-suffix rules, we must emulate a VPATH search.
+ my $xsource = "`test -f '$source' || echo '\$(srcdir)/'`$source";
+
$output_rules .=
file_contents ($rule_file,
new Automake::Location,
@@ -1350,6 +1354,7 @@ sub handle_languages ()
BASE => $obj,
SOURCE => $source,
+ XSOURCE => $xsource,
SOURCEFLAG => $sourceflags{$srcext} || '',
# Use $myext and not '.o' here, in case
# we are actually building a new source
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index a947ee7b6..b975be2f3 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -41,43 +41,29 @@ if %?NONLIBTOOL%
?GENERIC?%EXT%.o:
?!GENERIC?%OBJ%: %SOURCE%
if %FASTDEP%
- %VERBOSE%$(am__set_depbase) \
- && %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% \
-?GENERIC? %SOURCE% \
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
- && $(am__mv) $$depbase.Tpo $$depbase.Po
+ %VERBOSE%$(am__set_depbase) && \
+ %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% %XSOURCE% && \
+ $(am__mv) $$depbase.Tpo $$depbase.Po
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='$@' libtool=no @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
- %VERBOSE-NODEP%%COMPILE% -c -o $@ %SOURCEFLAG% \
-?GENERIC? %SOURCE%
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+ %VERBOSE-NODEP%%COMPILE% -c -o $@ %SOURCEFLAG% %XSOURCE%
endif !%FASTDEP%
?GENERIC?%EXT%.obj:
?!GENERIC?%OBJOBJ%: %SOURCE%
if %FASTDEP%
- %VERBOSE%$(am__set_depbase) \
- && %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% \
-?GENERIC? $$($(CYGPATH_W) '%SOURCE%') \
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? $$(if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
-?!GENERIC? else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi) \
- && $(am__mv) $$depbase.Tpo $$depbase.Po
+ %VERBOSE%$(am__set_depbase) && \
+ %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% $$($(CYGPATH_W) %XSOURCE%) && \
+ $(am__mv) $$depbase.Tpo $$depbase.Po
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='$@' libtool=no @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
- %VERBOSE-NODEP%%COMPILE% -c -o $@ %SOURCEFLAG% \
-?GENERIC? $$($(CYGPATH_W) '%SOURCE%')
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? $$(if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; \
-?!GENERIC? else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi)
+ %VERBOSE-NODEP%%COMPILE% -c -o $@ %SOURCEFLAG% $$($(CYGPATH_W) %XSOURCE%)
endif !%FASTDEP%
endif %?NONLIBTOOL%
@@ -85,20 +71,14 @@ if %?LIBTOOL%
?GENERIC?%EXT%.lo:
?!GENERIC?%LTOBJ%: %SOURCE%
if %FASTDEP%
- %VERBOSE%$(am__set_depbase) \
- && %LTCOMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% \
-?GENERIC? %SOURCE% \
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
- && $(am__mv) $$depbase.Tpo $$depbase.Plo
+ %VERBOSE%$(am__set_depbase) && \
+ %LTCOMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% %XSOURCE% && \
+ $(am__mv) $$depbase.Tpo $$depbase.Plo
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='$@' libtool=yes @AMDEPBACKSLASH@
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
- %VERBOSE-NODEP%%LTCOMPILE% -c -o $@ %SOURCEFLAG% \
-?GENERIC? %SOURCE%
-## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+ %VERBOSE-NODEP%%LTCOMPILE% -c -o $@ %SOURCEFLAG% %XSOURCE%
endif !%FASTDEP%
endif %?LIBTOOL%
diff --git a/t/silent-nested-vars.sh b/t/silent-nested-vars.sh
index f03204d0b..08f46fd26 100755
--- a/t/silent-nested-vars.sh
+++ b/t/silent-nested-vars.sh
@@ -67,7 +67,7 @@ case $1 in
done ;;
esac
-nested_var_pat='^[^#].*\$([^)]*\$'
+nested_var_pat='^[^#].*[^$]\$([^)]*\$'
if
case $makefile in
-) printf '%s\n' "$makerules" | grep "$nested_var_pat";;
--
cgit v1.2.1
From 50d986f5d0ccb3b175b91de10f46100d3adce79f Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Sun, 19 May 2013 00:07:33 +0200
Subject: tests: fix a spurious failure with FreeBSD make
Failures due to known VPATH support issues in that make implementation
(the same issues that have been causing the long-standing bug#7884).
* t/ltlibsrc.sh: Adjust.
Signed-off-by: Stefano Lattarini
---
t/ltlibsrc.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/t/ltlibsrc.sh b/t/ltlibsrc.sh
index 04a029fe7..c4979684f 100644
--- a/t/ltlibsrc.sh
+++ b/t/ltlibsrc.sh
@@ -39,6 +39,13 @@ zoo_d_old2_la.c: $(srcdir)/old_la.c
AUTOMAKE_OPTIONS = -Wno-unsupported
END
+if useless_vpath_rebuild; then
+ unindent >> Makefile.am <<'END'
+ # Work around a known FreeBSD make issues in VPATH builds.
+ DISTCLEANFILES = zoo_d_old2_la.c
+END
+fi
+
cat > foo.c << 'END'
int foo (void)
{
--
cgit v1.2.1
From fb653b7d4b2c9098223b41ac96034059790f00cd Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Mon, 20 May 2013 11:25:04 +0200
Subject: automake: cosmetic changes in indentation and line breaks
* bin/automake.in (handle_LIBOBJS_or_ALLOCA): Here.
Signed-off-by: Stefano Lattarini
---
bin/automake.in | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/bin/automake.in b/bin/automake.in
index 933f9b910..31d78f993 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -2110,24 +2110,22 @@ sub handle_lib_objects
sub handle_LIBOBJS_or_ALLOCA
{
my ($var) = @_;
-
my $dir = '';
# If LIBOBJS files must be built in another directory we have
# to define LIBOBJDIR and ensure the files get cleaned.
# Otherwise LIBOBJDIR can be left undefined, and the cleaning
# is achieved by 'rm -f *.$(OBJEXT)' in compile.am.
- if ($config_libobj_dir
- && $relative_dir ne $config_libobj_dir)
+ if ($config_libobj_dir && $relative_dir ne $config_libobj_dir)
{
# In the top-level Makefile we do not use $(top_builddir), because
# we are already there, and since the targets are built without
# a $(top_builddir), it helps BSD Make to match them with
# dependencies.
$dir = "$config_libobj_dir/"
- if $config_libobj_dir ne '.';
+ if $config_libobj_dir ne '.';
$dir = backname ($relative_dir) . "/$dir"
- if $relative_dir ne '.';
+ if $relative_dir ne '.';
define_variable ('LIBOBJDIR', "$dir", INTERNAL);
$clean_files{"\$($var)"} = MOSTLY_CLEAN;
# If LTLIBOBJS is used, we must also clear LIBOBJS (which might
--
cgit v1.2.1
From f7e618990e705d2525bb548175f1541cd106bd37 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Mon, 20 May 2013 11:40:36 +0200
Subject: automake: remove one extra trailing whitespace
* bin/automake.in (lang_vala_ignore): Here.
Signed-off-by: Stefano Lattarini
---
bin/automake.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/automake.in b/bin/automake.in
index 31d78f993..735dc832a 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -5363,7 +5363,7 @@ sub lang_header_ignore { 1; }
# Vala '.vapi' are a kind of header files as well, and should
# not be processed into compilation rules.
- sub lang_vala_ignore
+sub lang_vala_ignore
{
my ($directory, $base, $ext) = @_;
return ($ext =~ m/\.vapi$/ ? 1 : 0);
--
cgit v1.2.1
From 54858251ad2db124038978c9ce59540d94f5ba91 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Wed, 29 May 2013 10:22:43 +0200
Subject: NEWS: fix Automake versions
Reported-by: Peter Rosin
Signed-off-by: Stefano Lattarini
---
NEWS | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index 517215094..428a9a760 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@ New in 2.0:
object will *always* be put into the subdirectory named after the source
file, rather than in the current directory. For instance, 'src/file.c'
and 'src/file.f90' will be compiled to 'src/file.o', and 'sub/dir/mu.cc'
- will be compiled to 'sub/dir/mu.o'. Put in another way, Automake 1.14
+ will be compiled to 'sub/dir/mu.o'. Put in another way, Automake 2.0
and later will *unconditionally* behave as older Automake versions did
when the 'subdir-objects' option was given.
@@ -19,7 +19,7 @@ New in 2.0:
hierarchy, a definition of the AM_PROG_VALAC macro found in file
(say) '/usr/local/share/aclocal/my-vala.m4' should take precedence
over the same-named automake-provided macro, as defined in file
- '/usr/local/share/aclocal-1.14/vala.m4'.
+ '/usr/local/share/aclocal-2.0/vala.m4'.
* Obsolescent features flagged:
--
cgit v1.2.1
From 080668642dcd66242fb5b29df39f4b0b164636c7 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Wed, 29 May 2013 10:31:07 +0200
Subject: NEWS: drop an idiomatic use of latinism 'sic'
Reported-by: Peter Rosin
Signed-off-by: Stefano Lattarini
---
NEWS | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index 428a9a760..c1198566c 100644
--- a/NEWS
+++ b/NEWS
@@ -190,8 +190,8 @@ New in 1.14:
2. It caches the check result in the 'am_cv_prog_cc_c_o'variable,
and not in a 'ac_cv_prog_cc_*_c_o' variable whose exact name
- in only dynamically computed at configure runtime (sic!) from
- the content of the '$CC' variable.
+ in only dynamically computed at configure runtime (really!)
+ from the content of the '$CC' variable.
3. It no longer automatically AC_DEFINE the C preprocessor
symbol 'NO_MINUS_C_MINUS_O'.
--
cgit v1.2.1
From 7a57be384d484aef09de08038769985f32935f2f Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Wed, 29 May 2013 11:31:25 +0200
Subject: tests: avoid a spurious failure when $CC != cc
Fixes automake bug#14500.
* t/subpkg.sh: Improve the grepping of configure output.
Signed-off-by: Stefano Lattarini
---
t/subpkg.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/subpkg.sh b/t/subpkg.sh
index 1223b13a0..f15294331 100644
--- a/t/subpkg.sh
+++ b/t/subpkg.sh
@@ -104,7 +104,7 @@ cd ..
./configure >stdout || { cat stdout; exit 1; }
cat stdout
-grep '^checking whether cc understands -c and -o together' stdout
+$FGREP "checking whether $CC understands -c and -o together" stdout
$MAKE
$MAKE distcheck
--
cgit v1.2.1
From 455d0f33b1540e75006cbf267cd7bda1a70eb5bc Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Wed, 29 May 2013 11:41:09 +0200
Subject: tests: avoid a spurious failure when TeX is not installed.
Fixes automake bug#14499.
* t/txinfo-no-split.sh: If TeX is not available, redefine 'dvi' to be a
dummy target, so that "make distcheck" doesn't fail while trying to build
the DVI version of the Texinfo manual.
Signed-off-by: Stefano Lattarini
---
t/txinfo-no-split.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/t/txinfo-no-split.sh b/t/txinfo-no-split.sh
index aecf7e735..6a50f1ccb 100644
--- a/t/txinfo-no-split.sh
+++ b/t/txinfo-no-split.sh
@@ -34,6 +34,13 @@ check-local:
test "`find $(srcdir) . | grep '\.info'`" = "$(srcdir)/foo.info"
END
+# Systems lacking a working TeX installation cannot run "make dvi".
+if test -z "$TEX"; then
+ warn_ "TeX installation missing, \"make dvi\" will be skipped"
+ echo AUTOMAKE_OPTIONS = -Wno-override >> Makefile.am
+ echo 'dvi:; @echo Tex is missing, do nothing' >> Makefile.am
+fi
+
cat > foo.texi << 'END'
\input texinfo
@setfilename foo.info
--
cgit v1.2.1
From fefd1876075f39aa085d1b48c535e1f5808217b1 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Mon, 3 Jun 2013 22:25:24 +0200
Subject: fixup: botched merge for 'bin/automake.in'
* bin/automake.in (print_autodist_files): Here, we had unwittingly
botched up a 'format' invocation during the latest maint -> master
merge.
Signed-off-by: Stefano Lattarini
---
bin/automake.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/automake.in b/bin/automake.in
index e78c00577..07a63c20f 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -7745,7 +7745,7 @@ sub print_autodist_files
my @four;
format USAGE_FORMAT =
- <<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<
+ @<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<
$four[0], $four[1], $four[2], $four[3]
.
local $~ = "USAGE_FORMAT";
--
cgit v1.2.1
From b544f812182a00da93435491a39919844d48349e Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Mon, 21 Apr 2014 15:13:58 +0100
Subject: maint: update copyright (for files in 'master' only)
Signed-off-by: Stefano Lattarini
---
t/am-prog-mkdir-p.sh | 2 +-
t/txinfo-no-split.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/am-prog-mkdir-p.sh b/t/am-prog-mkdir-p.sh
index b561bfe04..bb76de764 100644
--- a/t/am-prog-mkdir-p.sh
+++ b/t/am-prog-mkdir-p.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2013 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 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
diff --git a/t/txinfo-no-split.sh b/t/txinfo-no-split.sh
index 6a50f1ccb..5bd790aa0 100644
--- a/t/txinfo-no-split.sh
+++ b/t/txinfo-no-split.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013 Free Software Foundation, Inc.
+# Copyright (C) 2013-2014 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
--
cgit v1.2.1
From 75ba55ff95160c6a59995263e29ee6061b815881 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Sat, 27 Dec 2014 23:20:12 +0100
Subject: tests: avoid a possible failure due to autom4te cache staleness
* t/includes-deprecation.sh: Here.
Signed-off-by: Stefano Lattarini
---
t/includes-deprecation.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/t/includes-deprecation.sh b/t/includes-deprecation.sh
index 7db0c0696..66a95644d 100644
--- a/t/includes-deprecation.sh
+++ b/t/includes-deprecation.sh
@@ -32,6 +32,8 @@ grep "^Makefile\\.am:2:.* 'INCLUDES'.* deprecated.* 'AM_CPPFLAGS'" stderr
AUTOMAKE_run -Wall -Wno-obsolete
test ! -s stderr
+$sleep
+
echo 'AC_SUBST([INCLUDES])' >> configure.ac
sed '/^INCLUDES/d' Makefile.am > t && mv -f t Makefile.am
--
cgit v1.2.1
From a4c0c62d52ad7b9785005302ee88311974b28dde Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Mon, 24 Dec 2012 11:23:06 +0100
Subject: texinfo: remove hack about info files in CLEANFILES variables
Automake used to implement an undocumented hack causing '.info' files
that appeared to be cleaned (by e.g. being listed in the CLEANFILES
variable) to also be built in the builddir rather than in the srcdir;
this was for backward compatibility with packages such as Texinfo,
which did things like:
info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
DISTCLEANFILES = texinfo texinfo-* info*.info*
# Do not create info files for distribution.
dist-info:
in order not to distribute .info files.
Now that we have the 'info-in-builddir' option that explicitly causes
generated '.info' files to be placed in the builddir, this hack is no
longer necessary, and we can remove it (after having deprecated it in
the Automake 1.14 release already).
* bin/automake.in (handle_texinfo_helper): Remove the hack. Adjust
comments accordingly.
* NEWS: Update.
* t/txinfo23.sh: Delete as obsolete.
* t/txinfo25.sh: Likewise.
* t/txinfo24.sh: Likewise.
* t/txinfo28.sh: Delete as mostly obsolete, its only still relevant
parts moved ...
* t/mdate5.sh: ... into this test.
* t/txinfo-clean.sh: Remove references to deleted tests.
* t/list-of-tests.mk: Adjust.
Signed-off-by: Stefano Lattarini
---
NEWS | 22 +++++++++-
bin/automake.in | 66 ++++++------------------------
t/list-of-tests.mk | 4 --
t/mdate5.sh | 51 ++++++++++++++---------
t/txinfo-clean.sh | 1 -
t/txinfo23.sh | 69 -------------------------------
t/txinfo24.sh | 83 --------------------------------------
t/txinfo25.sh | 116 -----------------------------------------------------
t/txinfo28.sh | 89 ----------------------------------------
9 files changed, 65 insertions(+), 436 deletions(-)
delete mode 100644 t/txinfo23.sh
delete mode 100644 t/txinfo24.sh
delete mode 100644 t/txinfo25.sh
delete mode 100644 t/txinfo28.sh
diff --git a/NEWS b/NEWS
index 3d8b363b9..bb011a882 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,26 @@ New in 2.0:
and later will *unconditionally* behave as older Automake versions did
when the 'subdir-objects' option was given.
+* Texinfo support:
+
+ - Automake used to implement an undocumented hack causing '.info' files
+ that appeared to be cleaned (by e.g. being listed in the CLEANFILES
+ variable) to also be built in the builddir rather than in the srcdir;
+ this was for backward compatibility with packages such as Texinfo,
+ which did things like:
+
+ info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
+ DISTCLEANFILES = texinfo texinfo-* info*.info*
+ # Do not create info files for distribution.
+ dist-info:
+ @:
+
+ in order not to distribute .info files.
+
+ Now that we have the 'info-in-builddir' option that explicitly causes
+ generated '.info' files to be placed in the builddir, this hack is no
+ longer necessary. We have thus removed\ it.
+
* Aclocal search path:
- Third-party m4 files located in the system-wide aclocal directory,
@@ -308,7 +328,7 @@ New in 1.14:
Now that we have the 'info-in-builddir' option that explicitly causes
generated '.info' files to be placed in the builddir, this hack should
be longer necessary, so we deprecate it with runtime warnings. It will
- likely be removed altogether in Automake 2.0.
+ be removed altogether in Automake 2.0.
* Relative directory in Makefile fragments:
diff --git a/bin/automake.in b/bin/automake.in
index c06fc0fa4..c6bf923a9 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -2948,15 +2948,6 @@ sub handle_texinfo_helper
my $done = 0;
my (@mostly_cleans, @texi_cleans, @maint_cleans) = ('', '', '');
- # Build a regex matching user-cleaned files.
- my $d = var 'DISTCLEANFILES';
- my $c = var 'CLEANFILES';
- my @f = ();
- push @f, $d->value_as_list_recursive (inner_expand => 1) if $d;
- push @f, $c->value_as_list_recursive (inner_expand => 1) if $c;
- @f = map { s|[^A-Za-z_0-9*\[\]\-]|\\$&|g; s|\*|[^/]*|g; $_; } @f;
- my $user_cleaned_files = '^(?:' . join ('|', @f) . ')$';
-
foreach my $texi
($info_texinfos->value_as_list_recursive (inner_expand => 1))
{
@@ -2996,6 +2987,7 @@ sub handle_texinfo_helper
# generic rules.
my $outdir = dirname ($texi) . '/';
$outdir = "" if $outdir eq './';
+ my $src_outdir = '$(srcdir)/'. $outdir;
$out_file = $outdir . $out_file;
# Until Automake 1.6.3, .info files were built in the
@@ -3086,54 +3078,22 @@ sub handle_texinfo_helper
# Consequently, starting with Automake 1.8, .info files are
# built in the source tree again. Because we still plan to
# support non-distributed .info files at some point, we
- # have a single variable ($INSRC) that controls whether
+ # have a single variable ('$insrc') that controls whether
# the current .info file must be built in the source tree
# or in the build tree. Actually this variable is switched
- # off in two cases:
- # (1) For '.info' files that appear to be cleaned; this is for
- # backward compatibility with package such as Texinfo,
- # which do things like
- # info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
- # DISTCLEANFILES = texinfo texinfo-* info*.info*
- # # Do not create info files for distribution.
- # dist-info:
- # in order not to distribute .info files.
- # (2) When the undocumented option 'info-in-builddir' is given.
- # This is done to allow the developers of GCC, GDB, GNU
- # binutils and the GNU bfd library to force the '.info' files
- # to be generated in the builddir rather than the srcdir, as
- # was once done when the (now removed) 'cygnus' option was
- # given. See automake bug#11034 for more discussion.
- my $insrc = 1;
- my $soutdir = '$(srcdir)/' . $outdir;
-
- if (option 'info-in-builddir')
- {
- $insrc = 0;
- }
- elsif ($out_file =~ $user_cleaned_files)
- {
- $insrc = 0;
- msg 'obsolete', "$am_file.am", < $texi,
VTI => $vti,
- STAMPVTI => "${soutdir}stamp-$vti",
- VTEXI => "$soutdir$vtexi",
+ STAMPVTI => "${src_outdir}stamp-$vti",
+ VTEXI => "${src_outdir}$vtexi",
MDDIR => $conf_dir,
DIRSTAMP => $dirstamp);
}
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 630417c47..85f58ad29 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -1220,10 +1220,6 @@ t/txinfo-vtexi2.sh \
t/txinfo-vtexi3.sh \
t/txinfo-vtexi4.sh \
t/txinfo-without-info-suffix.sh \
-t/txinfo23.sh \
-t/txinfo24.sh \
-t/txinfo25.sh \
-t/txinfo28.sh \
t/transform.sh \
t/transform2.sh \
t/transform3.sh \
diff --git a/t/mdate5.sh b/t/mdate5.sh
index 89ee0c439..108569ea9 100644
--- a/t/mdate5.sh
+++ b/t/mdate5.sh
@@ -21,25 +21,36 @@ am_create_testdir=empty
get_shell_script mdate-sh
-set x $(./mdate-sh mdate-sh)
-shift
-echo "$*" # For debugging.
-
-# Check that mdate output looks like a date:
-test $# = 3
-case $1$3 in *[!0-9]*) exit 1;; esac
-test $1 -lt 32
-# Hopefully automake will be obsolete in 80 years ;-)
-case $3 in 20[0-9][0-9]) :;; *) exit 1;; esac
-case $2 in
- January|February|March|April|May|June|July|August) ;;
- September|October|November|December) ;;
- *) exit 1
-esac
-
-# Stricter checks on the year required a POSIX date(1) command.
-if year=$(date +%Y) && test $year -gt 2010; then
- test $year = $3 || exit 1
-fi
+year=$(date +%Y) && test $year -gt 2010 || year=NONE
+
+do_checks ()
+{
+ set x $(./mdate-sh mdate-sh)
+ shift
+ echo "$*" # For debugging.
+
+ # Check that mdate output looks like a date.
+ test $# = 3 || exit 1
+ case $1$3 in *[!0-9]*) exit 1;; esac
+ test $1 -lt 32 || exit 1
+ # Hopefully automake will be obsolete in 80 years ;-)
+ case $3 in 20[0-9][0-9]) :;; *) exit 1;; esac
+ case $2 in
+ January|February|March|April|May|June|July|August) ;;
+ September|October|November|December) ;;
+ *) exit 1
+ esac
+
+ # Stricter checks on the year require a POSIX date(1) command.
+ test $year = NONE || test $year = $3 || exit 1
+}
+
+TIME_STYLE=; unset TIME_STYLE
+do_checks
+
+# This setting, when honored by GNU ls, used to cause an infinite
+# loop in mdate-sh.
+TIME_STYLE="+%Y-%m-%d %H:%M:%S"; export TIME_STYLE
+do_checks
:
diff --git a/t/txinfo-clean.sh b/t/txinfo-clean.sh
index b936e410e..f5e874565 100644
--- a/t/txinfo-clean.sh
+++ b/t/txinfo-clean.sh
@@ -15,7 +15,6 @@
# along with this program. If not, see .
# DVIS, PDFS, PSS, HTMLS should not be cleaned upon 'mostlyclean'.
-# Similar to txinfo25.sh.
required='makeinfo tex texi2dvi dvips'
. test-init.sh
diff --git a/t/txinfo23.sh b/t/txinfo23.sh
deleted file mode 100644
index e71fc5745..000000000
--- a/t/txinfo23.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002-2014 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# Check that info files are built in builddir when needed.
-# Test with subdir Texinfo.
-# (Similar to txinfo13.sh, plus DISTCLEANFILES).
-# (See also txinfo24.sh and txinfo25.sh).
-
-required='makeinfo tex texi2dvi'
-. test-init.sh
-
-cat >> configure.ac << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-DISTCLEANFILES = subdir/*.info*
-info_TEXINFOS = subdir/main.texi
-subdir_main_TEXINFOS = subdir/inc.texi
-
-installcheck-local:
- test -f "$(infodir)/main.info"
-END
-
-mkdir subdir
-
-cat > subdir/main.texi << 'END'
-\input texinfo
-@setfilename main.info
-@settitle main
-@node Top
-Hello walls.
-@include version.texi
-@include inc.texi
-@bye
-END
-
-cat > subdir/inc.texi << 'END'
-I'm included.
-END
-
-$ACLOCAL
-$AUTOCONF
-
-AUTOMAKE_run --add-missing -Wno-error
-grep "Makefile\.am:.*undocumented.* automake hack" stderr
-grep "Makefile\.am:.*'info-in-builddir' automake option" stderr
-
-mkdir build
-cd build
-../configure
-$MAKE distcheck
-test -f subdir/main.info
-test ! -e ../subdir/main.info
-
-:
diff --git a/t/txinfo24.sh b/t/txinfo24.sh
deleted file mode 100644
index df202a8fa..000000000
--- a/t/txinfo24.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002-2014 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# Check that info files are built in builddir when needed.
-# (Similar to txinfo16.sh, plus CLEANFILES).
-# (See also txinfo23.sh and txinfo25.sh).
-
-required='makeinfo tex texi2dvi'
-. test-init.sh
-
-cat >> configure.ac << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-CLEANFILES = main.info
-info_TEXINFOS = main.texi
-END
-
-cat > main.texi << 'END'
-\input texinfo
-@setfilename main.info
-@settitle main
-@node Top
-Hello walls.
-@include version.texi
-@bye
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing -Wno-obsolete
-$AUTOCONF
-
-mkdir build
-cd build
-../configure
-$MAKE
-test ! -e ../main.info
-test -f main.info
-
-cd ..
-rm -rf build
-./configure
-$MAKE
-test -f main.info
-
-# Make sure stamp-vti is older that version.texi.
-# (A common situation in a real tree).
-test -f stamp-vti
-test -f version.texi
-$sleep
-touch stamp-vti
-
-$MAKE distclean
-test -f stamp-vti
-test -f version.texi
-
-mkdir build
-cd build
-../configure
-$MAKE
-# main.info should be rebuilt in the current directory.
-test -f main.info
-test ! -e ../main.info
-$MAKE dvi
-test -f main.dvi
-
-$MAKE distcheck
-
-:
diff --git a/t/txinfo25.sh b/t/txinfo25.sh
deleted file mode 100644
index 8d7f12748..000000000
--- a/t/txinfo25.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003-2014 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# Check that info files are built in builddir and in srcdir can safely
-# co-exist. This setup is obtained by having two info files, only one
-# of which being cleaned.
-# (Similar to txinfo16.sh, plus CLEANFILES).
-# (See also txinfo23.sh and txinfo24.sh).
-
-required='makeinfo tex texi2dvi'
-. test-init.sh
-
-cat >> configure.ac << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-CLEANFILES = [a-m]*.info
-info_TEXINFOS = main.texi other.texi
-END
-
-cat > main.texi << 'END'
-\input texinfo
-@setfilename main.info
-@settitle main
-@node Top
-Hello walls.
-@include version.texi
-@bye
-END
-
-cat > other.texi << 'END'
-\input texinfo
-@setfilename other.info
-@settitle other
-@node Top
-Hello walls.
-@include version2.texi
-@bye
-END
-
-$ACLOCAL
-$AUTOCONF
-
-AUTOMAKE_fails --add-missing
-grep "Makefile\.am:.*undocumented.* automake hack" stderr
-grep "Makefile\.am:.*'info-in-builddir' automake option" stderr
-
-$AUTOMAKE --add-missing -Wno-obsolete
-
-mkdir build
-cd build
-../configure
-$MAKE
-test -f main.info
-test ! -e ../main.info
-test ! -e other.info
-test -f ../other.info
-
-cd ..
-rm -rf build
-./configure
-$MAKE
-test -f main.info
-test -f other.info
-
-# Make sure stamp-vti is older that version.texi.
-# (A common situation in a real tree).
-# This is needed to test the "subtle" issue described below.
-test -f stamp-vti
-test -f version.texi
-test -f stamp-1
-test -f version2.texi
-$sleep
-touch stamp-vti
-touch stamp-1
-
-$MAKE distclean
-test -f stamp-vti
-test -f stamp-1
-test -f version.texi
-test -f version2.texi
-
-mkdir build
-cd build
-../configure
-$MAKE
-# other.info should not be rebuilt in the current directory, since
-# it's up-to-date in $(srcdir).
-# This can be caused by a subtle issue related to VPATH handling
-# of version.texi (see also the comment in texi-vers.am): because
-# stamp-vti is newer than version.texi, the 'version.texi: stamp-vti'
-# rule is always triggered. Still that's not a reason for 'make'
-# to think 'version.texi' has been created...
-test -f main.info
-test ! -e other.info
-$MAKE dvi
-test -f main.dvi
-test -f other.dvi
-
-$MAKE distcheck
-
-:
diff --git a/t/txinfo28.sh b/t/txinfo28.sh
deleted file mode 100644
index 93929c3e3..000000000
--- a/t/txinfo28.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002-2014 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# Check that info files are built in builddir when needed.
-# Similar to txinfo24.sh, but obfuscating filenames with variable
-# references.
-# Report from Ralf Corsepius.
-
-required='makeinfo tex texi2dvi'
-. test-init.sh
-
-# This setting, when honored by GNU ls, used to cause an infinite loop
-# in mdate-sh.
-TIME_STYLE="+%Y-%m-%d %H:%M:%S"
-export TIME_STYLE
-
-echo AC_OUTPUT >> configure.ac
-
-cat > Makefile.am << 'END'
-MA = ma
-IN = in
-PROJ = $(MA)$(IN)
-include fragment.mk
-info_TEXINFOS = ma$(IN).texi
-END
-
-echo 'CLEANFILES = $(PROJ).info' > fragment.mk
-
-cat > main.texi << 'END'
-\input texinfo
-@setfilename main.info
-@settitle main
-@node Top
-Hello walls.
-@include version.texi
-@bye
-END
-
-$ACLOCAL
-$AUTOMAKE --add-missing -Wno-error
-$AUTOCONF
-
-mkdir build
-cd build
-../configure
-$MAKE
-test -f main.info
-
-cd ..
-rm -rf build
-./configure
-$MAKE
-test -f main.info
-
-# Make sure stamp-vti is older that version.texi.
-# (A common situation in a real tree).
-test -f stamp-vti
-test -f version.texi
-$sleep
-touch stamp-vti
-
-$MAKE distclean
-test -f stamp-vti
-test -f version.texi
-
-mkdir build
-cd build
-../configure
-$MAKE
-# main.info should be rebuilt in the current directory.
-test -f main.info
-test ! -e ../main.info
-$MAKE dvi
-test -f main.dvi
-
-$MAKE distcheck
--
cgit v1.2.1
From 7b598ba455b3e141e48d0f8a3d73475b39b6adc1 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Mon, 5 Jan 2015 22:05:49 +0100
Subject: maint: bump version number 1.15 -> 1.15a ('minor' Git branch)
* configure.ac (AC_INIT): Bump version number to 1.15a.
* m4/amversion.m4: Likewise (auto-updated by "make bootstrap").
Signed-off-by: Stefano Lattarini
---
configure.ac | 2 +-
m4/amversion.m4 | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index beb9eabd7..11a908f21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
# along with this program. If not, see .
AC_PREREQ([2.69])
-AC_INIT([GNU Automake], [1.15], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.15a], [bug-automake@gnu.org])
AC_CONFIG_SRCDIR([bin/automake.in])
AC_CONFIG_AUX_DIR([lib])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index ca4231f74..ed7053311 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -12,10 +12,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.15a'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.15a], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.15a])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
--
cgit v1.2.1
From 46ce39e1a24f3016db3bc6cf857977be7a1cda1b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Mon, 5 Jan 2015 23:01:38 +0100
Subject: maint: update copyright years to 2015 (branch 'master')
* t/am-prog-mkdir-p.sh: Here.
* t/txinfo-no-split.sh: And here.
Signed-off-by: Stefano Lattarini
---
t/am-prog-mkdir-p.sh | 2 +-
t/txinfo-no-split.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/am-prog-mkdir-p.sh b/t/am-prog-mkdir-p.sh
index bb76de764..744d6b5d1 100644
--- a/t/am-prog-mkdir-p.sh
+++ b/t/am-prog-mkdir-p.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2014 Free Software Foundation, Inc.
+# Copyright (C) 2012-2015 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
diff --git a/t/txinfo-no-split.sh b/t/txinfo-no-split.sh
index 5bd790aa0..a7debb54a 100644
--- a/t/txinfo-no-split.sh
+++ b/t/txinfo-no-split.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+# Copyright (C) 2013-2015 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
--
cgit v1.2.1
From 6a675ef17edf7109da189f5ae70e2dc6b7665896 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Wed, 24 Dec 2014 10:57:17 +0100
Subject: deps: 'subdir-object' option now works when foo_SOURCES contains
$(var)
Following a suggestions of Johan Kristensen, we have config.status use
'make' invocations rather than Makefile-parsing 'sed' hacks to bootstrap
the dependency-tracking '.Po' and '.Plo' makefile fragments. To handle
the inclusion of such files that are still missing when make is first
we basically generate a temporary Makefile without these includes, and
call 'make' on that Makefile.
This fixes the serious bug bug#13928, which was an hard blocker to make the
behavior mandated by the 'subdir-object' active by default (which we want
to do in Automake 2.0).
The issue has also been reported in bug#15919.
* NEWS, THANKS: Update.
* bin/automake.in (handle_languages): Add a trailing "marking" comment
("# am--include-marker") to the generated Makefile lines issuing 'include'
directives for the dependency-tracking '.Po' and '.Plo' makefile fragments.
Also rename the generated Makefile variable 'am__depfiles_maybe' to the
clearer 'am__maybe_remake_depfiles'.
Minor unrelated refactoring.
* lib/am/configure.am: Adjust to account for the 'am__depfiles_maybe' ->
'am__maybe_remake_depfiles' renaming.
* lib/am/depend.am: Add rules to generate a dummy version of all the
dependency-tracking '.Po' and '.Plo' makefile fragments.
* m4/depout.m4: Use make invocations rather than Makefile-parsing sed hacks
to bootstrap the dependency-tracking '.Po' and '.Plo' makefile fragments.
We still use some sed trickery in order to remove the inclusion of the
still non existing .Po and .Plo files from the Makefile we invoke make
upon; this is done stripping lines that contain the magic string
"# am--include-marker".
* m4/make.m4 (AM_MAKE_INCLUDE): Given that now automake generates Makefiles
containing include statements with trailing comment, adjust the checks done
here to make sure $MAKE support that; e.g., "include foo.mk # comment"
rather than just "include foo.mk".
Also refactor and adjust to leave better debugging info in config.log.
* t/postproc.sh: Rename ...
* t/depend-postproc.sh: ... to this, and adjust and enhance.
* t/list-of-tests.mk (handwritten_TESTS): Adjust.
(XFAIL_TESTS): Remove 't/subobj-indir-pr13928.sh', which is now succeeding.
* t/subobj-indir-pr13928.sh: Simplify slightly, now that we expect it to
pass.
* t/depcomp8a.sh: Adjust grepping check to account for the changes in
the generated Makefile, and tp be somewhat more robust in light of possible
future modifications.
* t/depcomp8b.sh: Likewise.
* t/subobj11b.sh: Likewise.
* t/subobj11c.sh: Likewise.
* t/extra-sources.sh: Likewise.
* t/lex-depend-grep.sh: Likewise.
* t/lex-depend-cxx.sh: Add a command to help debugging in case of test
failure.
Helped-by: Johan Kristensen
Signed-off-by: Stefano Lattarini
---
NEWS | 28 ++++++++++++++++
THANKS | 1 +
bin/automake.in | 84 ++++++++++++++++++++++++-----------------------
lib/am/configure.am | 6 ++--
lib/am/depend.am | 7 ++++
m4/depout.m4 | 78 +++++++++++++++++++------------------------
m4/make.m4 | 59 +++++++++++++++------------------
t/depcomp8a.sh | 16 ++++-----
t/depcomp8b.sh | 16 ++++-----
t/depend-postproc.sh | 71 +++++++++++++++++++++++++++++++++++++++
t/extra-sources.sh | 5 +--
t/lex-depend-cxx.sh | 5 +++
t/lex-depend-grep.sh | 2 +-
t/list-of-tests.mk | 3 +-
t/postproc.sh | 48 ---------------------------
t/subobj-indir-pr13928.sh | 4 ++-
t/subobj11b.sh | 10 +++---
t/subobj11c.sh | 2 +-
18 files changed, 248 insertions(+), 197 deletions(-)
create mode 100644 t/depend-postproc.sh
delete mode 100644 t/postproc.sh
diff --git a/NEWS b/NEWS
index 294d2030b..226f76c66 100644
--- a/NEWS
+++ b/NEWS
@@ -62,6 +62,34 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+New in 1.16:
+
+* Bugs fixed:
+
+ - Automatic dependency tracking has been fixed to work also when the
+ subdir-object option is used and some 'foo_SOURCES' definition contains
+ unexpanded references to make variables, as in, e.g.:
+
+ a_src = sources/libs/aaa
+ b_src = sources/bbb
+ foo_SOURCES = $(a_src)/bar.c $(b_src)/baz.c
+
+ With such a setup, the created makefile fragment containing dependency
+ tracking information will be correctly placed under the directories
+ named 'sources/libs/aaa/.deps' and 'sources/bbb/.deps', rather than
+ mistakenly under directories named (literally!) '$(src_a)/.deps' and
+ '$(src_b)/.deps' (this was automake bug#13928).
+
+ Notice that in order to fix this bug we had to slightly change the
+ semantics of how config.status bootstraps the makefile fragments
+ required for the dependency tracking to work: rather than attempting
+ to parse the Makefiles via grep and sed trickeries only, we actually
+ invoke 'make' on a slightly preprocessed version of those Makefiles,
+ using a private target that is only meant to bootstrap the required
+ makefile fragments.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
New in 1.15:
* Improvements and refactorings in the install-sh script:
diff --git a/THANKS b/THANKS
index b66f744f3..8b87d585b 100644
--- a/THANKS
+++ b/THANKS
@@ -192,6 +192,7 @@ Joel N. Weber II nemo@koa.iolani.honolulu.hi.us
Joerg-Martin Schwarz jms@jms.prima.ruhr.de
Johan Dahlin jdahlin@async.com.br
Johan Danielsson joda@pdc.kth.se
+Johan Kristensen johankristensen@gmail.com
Johannes Nicolai johannes.nicolai@student.hpi.uni-potsdam.de
John Calcote john.calcote@gmail.com
John F Trudeau JohnTrudeau@firsthealth.com
diff --git a/bin/automake.in b/bin/automake.in
index a3a0aa318..681b3d2a5 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1230,48 +1230,50 @@ sub check_user_variables
sub handle_languages ()
{
if (! option 'no-dependencies')
- {
- # Include auto-dep code. Don't include it if DEP_FILES would
- # be empty.
- if (keys %extension_seen && keys %dep_files)
- {
- # Set location of depcomp.
- define_variable ('depcomp',
- "\$(SHELL) $am_config_aux_dir/depcomp",
- INTERNAL);
- define_variable ('am__depfiles_maybe', 'depfiles', INTERNAL);
-
- require_conf_file ("$am_file.am", FOREIGN, 'depcomp');
-
- my @deplist = sort keys %dep_files;
- # Generate each 'include' individually. Irix 6 make will
- # not properly include several files resulting from a
- # variable expansion; generating many separate includes
- # seems safest.
- $output_rules .= "\n";
- foreach my $iter (@deplist)
- {
- $output_rules .= (subst ('AMDEP_TRUE')
- . subst ('am__include')
- . ' '
- . subst ('am__quote')
- . $iter
- . subst ('am__quote')
- . "\n");
- }
-
- # Compute the set of directories to remove in distclean-depend.
- my @depdirs = uniq (map { dirname ($_) } @deplist);
- $output_rules .= file_contents ('depend',
- new Automake::Location,
- DEPDIRS => "@depdirs");
- }
- }
+ {
+ # Include auto-dep code. Don't include it if DEP_FILES would
+ # be empty.
+ if (keys %extension_seen && keys %dep_files)
+ {
+ my @dep_files = sort keys %dep_files;
+ # Set location of depcomp.
+ define_variable ('depcomp',
+ "\$(SHELL) $am_config_aux_dir/depcomp",
+ INTERNAL);
+ define_variable ('am__maybe_remake_depfiles', 'depfiles', INTERNAL);
+ define_variable ('am__depfiles_remade', "@dep_files", INTERNAL);
+ # Generate each 'include' directive individually. Several make
+ # implementations (IRIX 6, Solaris 10, FreeBSD 8) will fail to
+ # properly include several files resulting from a variable
+ # expansion. Just Generating many separate includes seems thus
+ # safest.
+ $output_rules .= "\n";
+ foreach my $depfile (@dep_files)
+ {
+ $output_rules .= subst ('AMDEP_TRUE') .
+ subst ('am__include') .
+ " " .
+ subst('am__quote') .
+ $depfile .
+ subst('am__quote') .
+ " " .
+ "# am--include-marker\n";
+ }
+
+ require_conf_file ("$am_file.am", FOREIGN, 'depcomp');
+
+ # Compute the set of directories to remove in distclean-depend.
+ my @dep_dirs = uniq (map { dirname ($_) } @dep_files);
+ $output_rules .= file_contents ('depend',
+ new Automake::Location,
+ DEPDIRS => "@dep_dirs");
+ }
+ }
else
- {
- define_variable ('depcomp', '', INTERNAL);
- define_variable ('am__depfiles_maybe', '', INTERNAL);
- }
+ {
+ define_variable ('depcomp', '', INTERNAL);
+ define_variable ('am__maybe_remake_depfiles', '', INTERNAL);
+ }
my %done;
diff --git a/lib/am/configure.am b/lib/am/configure.am
index 0f1abac38..ad6717b41 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -76,10 +76,10 @@ endif %?TOPDIR_P%
?TOPDIR_P? $(SHELL) ./config.status;; \
?!TOPDIR_P? cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
-## FIXME: $(am__depfiles_maybe) lets us re-run the rule to create the
+## FIXME: $(am__maybe_remake_depfiles) lets us re-run the rule to create the
## .P files. Ideally we wouldn't have to do this by hand.
- echo ' cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE% $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE% $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE% $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status %CONFIG-MAKEFILE% $(am__maybe_remake_depfiles);; \
esac;
## Avoid the "deleted header file" problem for the dependencies.
diff --git a/lib/am/depend.am b/lib/am/depend.am
index 54ea220fe..3711d5d12 100644
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -16,6 +16,13 @@
am__mv = mv -f
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+.PHONY: am--depfiles
+
## This Makefile depends on Depdirs' files, so we should never
## erase them in -am or -recursive rules; that would prevent any other
## rules from being recursive (for instance multilib clean rules are
diff --git a/m4/depout.m4 b/m4/depout.m4
index 0032e8ed4..c3936a71d 100644
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -6,7 +6,6 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -14,49 +13,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -65,11 +56,10 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
diff --git a/m4/make.m4 b/m4/make.m4
index 704e32fdd..fff073329 100644
--- a/m4/make.m4
+++ b/m4/make.m4
@@ -8,42 +8,35 @@
# AM_MAKE_INCLUDE()
# -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+ ['0:this is the am__doit target'],
+ [AS_CASE([$s],
+ [BSD], [am__include='.include' am__quote='"'],
+ [am__include='include' am__quote=''])])
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
diff --git a/t/depcomp8a.sh b/t/depcomp8a.sh
index 5f14ee09a..07bbfc1fd 100644
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
@@ -51,10 +51,10 @@ $ACLOCAL
# FIXME: stop disabling the warnings in the 'unsupported' category
# FIXME: once the 'subdir-objects' option has been mandatory.
$AUTOMAKE -a -Wno-unsupported
-grep include Makefile.in # For debugging.
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in
-grep 'include.*/\./\$(DEPDIR)' Makefile.in && exit 1
+grep '\.P' Makefile.in # For debugging.
+grep '\./\$(DEPDIR)/foo\.Po' Makefile.in
+grep '\./\$(DEPDIR)/bar\.Po' Makefile.in
+grep '/\./\$(DEPDIR)' Makefile.in && exit 1
$AUTOCONF
# Don't reject slower dependency extractors, for better coverage.
@@ -68,10 +68,10 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
$AUTOMAKE
-grep include Makefile.in # For debugging.
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
-$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
+grep '\.P' Makefile.in # For debugging.
+grep '\./\$(DEPDIR)/foo\.Po' Makefile.in
+grep '[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.Po' Makefile.in
+$EGREP '/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
$AUTOCONF
# Don't reject slower dependency extractors, for better coverage.
diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh
index 8dd86a308..3f7f08244 100644
--- a/t/depcomp8b.sh
+++ b/t/depcomp8b.sh
@@ -48,10 +48,10 @@ $ACLOCAL
# FIXME: stop disabling the warnings in the 'unsupported' category
# FIXME: once the 'subdir-objects' option has been mandatory.
$AUTOMAKE -a -Wno-unsupported
-grep include Makefile.in # For debugging.
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in
-grep 'include.*/\./\$(DEPDIR)' Makefile.in && exit 1
+grep '\.P' Makefile.in # For debugging.
+grep '\./\$(DEPDIR)/foo\.Plo' Makefile.in
+grep '\./\$(DEPDIR)/bar\.Plo' Makefile.in
+grep '/\./\$(DEPDIR)' Makefile.in && exit 1
$AUTOCONF
# Don't reject slower dependency extractors, for better coverage.
@@ -64,10 +64,10 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking' $MAKE distcheck
echo AUTOMAKE_OPTIONS += subdir-objects >> Makefile.am
$AUTOMAKE
-grep include Makefile.in # For debugging.
-grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
-grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
-$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
+grep '\.P' Makefile.in # For debugging.
+grep '\./\$(DEPDIR)/foo\.Plo' Makefile.in
+grep '[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.Plo' Makefile.in
+$EGREP '/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
$AUTOCONF
# Don't reject slower dependency extractors, for better coverage.
diff --git a/t/depend-postproc.sh b/t/depend-postproc.sh
new file mode 100644
index 000000000..1411783e0
--- /dev/null
+++ b/t/depend-postproc.sh
@@ -0,0 +1,71 @@
+#! /bin/sh
+# Copyright (C) 2002-2015 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+# Check to make sure we recognize a Makefile.in, even if post-processed
+# and renamed. The particularly tricky code for automatic dependency
+# tracking support used to have issues with that.
+
+required=cc
+. test-init.sh
+
+cat > configure.ac < myMakefile.am <<'END'
+bin_PROGRAMS = fred
+fred_SOURCES = fred.c
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -- myMakefile
+
+mv myMakefile.in myMakefile.old
+echo '# Post-processed by post-processor 3.14.' > myMakefile.in
+cat myMakefile.old >> myMakefile.in
+
+./configure
+
+test -f .deps/fred.Po || test -f _deps/fred.Po || exit 1
+
+$sleep
+
+cat > Makefile <<'END'
+include myMakefile
+END
+
+sed 's/^dnl: *//' configure.ac >t
+mv -f t configure.ac
+
+$MAKE myMakefile Makefile
+
+rm -rf .deps _deps
+./config.status
+
+test ! -e fred.c
+echo 'int main (void) { return 0; }' > fred.c
+
+$MAKE
+test -f .deps/fred.Po || test -f _deps/fred.Po || exit 1
+$MAKE distcheck
+
+:
diff --git a/t/extra-sources.sh b/t/extra-sources.sh
index cd276dbcc..cbffc9080 100644
--- a/t/extra-sources.sh
+++ b/t/extra-sources.sh
@@ -21,7 +21,7 @@
echo AC_PROG_CC >> configure.ac
-cat > Makefile.am << 'END'
+cat > Makefile.am <<'END'
bin_PROGRAMS = www
www_SOURCES = www.c
EXTRA_www_SOURCES = xtra.c
@@ -31,6 +31,7 @@ END
$ACLOCAL
$AUTOMAKE
-grep '@am__include@ .*/xtra\.P' Makefile.in
+grep '@am__include@ .*/xtra\.Po' Makefile.in
+grep '^am__depfiles_remade =.*/xtra.Po' Makefile.in
:
diff --git a/t/lex-depend-cxx.sh b/t/lex-depend-cxx.sh
index fc89c8aa5..79a2f3b77 100644
--- a/t/lex-depend-cxx.sh
+++ b/t/lex-depend-cxx.sh
@@ -82,6 +82,11 @@ $AUTOCONF
# using slow dependency extractors.
./configure --enable-dependency-tracking
+# For debugging.
+for f in $(find . -name '*.Po'); do
+ cat $f
+done
+
$MAKE test-deps-exist
$MAKE
diff --git a/t/lex-depend-grep.sh b/t/lex-depend-grep.sh
index dedea2d31..70e5cb8d2 100644
--- a/t/lex-depend-grep.sh
+++ b/t/lex-depend-grep.sh
@@ -40,7 +40,7 @@ $AUTOMAKE -a
$EGREP '([mj]oe|_[01234]|include|\.P)' Makefile.in # For debugging.
for x in joe moe _0 _1 _2 _3 _4; do
- grep "include.*$x\.Po" Makefile.in
+ $EGREP '\$\(DEPDIR\)/'"$x"'\.Po( |$)' Makefile.in
done
:
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 01c1a53ae..862bb29d2 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -41,7 +41,6 @@ t/java-nobase.sh \
t/objext-pr10128.sh \
t/remake-timing-bug-pr8365.sh \
t/lex-subobj-nodep.sh \
-t/subobj-indir-pr13928.sh \
t/subobj-vpath-pr13928.sh \
t/remake-am-pr10111.sh \
t/remake-m4-pr10111.sh \
@@ -391,6 +390,7 @@ t/depend3.sh \
t/depend4.sh \
t/depend5.sh \
t/depend6.sh \
+t/depend-postproc.sh \
t/deprecated-acinit.sh \
t/destdir.sh \
t/dir-named-obj-is-bad.sh \
@@ -866,7 +866,6 @@ t/posixsubst-programs.sh \
t/posixsubst-scripts.sh \
t/posixsubst-sources.sh \
t/posixsubst-tests.sh \
-t/postproc.sh \
t/ppf77.sh \
t/pr2.sh \
t/pr9.sh \
diff --git a/t/postproc.sh b/t/postproc.sh
deleted file mode 100644
index 94909ce15..000000000
--- a/t/postproc.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002-2015 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# Check to make sure we recognize a Makefile.in, even if post-processed
-# and renamed.
-
-required=cc
-. test-init.sh
-
-cat >configure.ac < myMakefile.am << 'END'
-bin_PROGRAMS = fred
-fred_SOURCES = fred.c
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -- myMakefile
-
-mv myMakefile.in myMakefile.old
-echo '# Post-processed by post-processor 3.14.' > myMakefile.in
-cat myMakefile.old >> myMakefile.in
-
-./configure
-
-test -f .deps/fred.Po || test -f _deps/fred.Po || exit 1
-
-:
diff --git a/t/subobj-indir-pr13928.sh b/t/subobj-indir-pr13928.sh
index afad53b21..9a7116d35 100644
--- a/t/subobj-indir-pr13928.sh
+++ b/t/subobj-indir-pr13928.sh
@@ -38,7 +38,9 @@ END
mkdir s
echo 'int main(void) { return 0; }' > s/foo.c
-$ACLOCAL && $AUTOCONF && $AUTOMAKE -a || fatal_ "autotools failed"
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
./configure
$MAKE
diff --git a/t/subobj11b.sh b/t/subobj11b.sh
index db29e5e58..12e2216d2 100644
--- a/t/subobj11b.sh
+++ b/t/subobj11b.sh
@@ -56,9 +56,9 @@ END
$ACLOCAL
$AUTOMAKE -a
-# Be lax in the regexp, to account for automake conditionals, the
-# use of @am__include@, and similar stuff.
-grep 'include.*//.*foobar' Makefile.in && exit 1
+grep '\.P' Makefile.in # For debugging.
+
+grep '//.*foobar\.P' Makefile.in && exit 1
# These checks depend on automake internals, but presently this is
# the only way to test the code path we are interested in.
@@ -71,12 +71,12 @@ for x in zardoz0 zardoz1 path/to/zardoz2 another/path/to/zardoz3; do
esac
# Be a little lax in the regexp, to account for automake conditionals,
# quoting, and similar stuff.
- grep "^[^/]*am__include[^/]*//server/$d\\\$(DEPDIR)/$b\\.[^/]*$" Makefile.in
+ grep "[ ]//server/$d\\\$(DEPDIR)/$b\\.Po" Makefile.in
done
# Sanity checks.
for i in 0 1 2 3 4 5 6 7 8 9; do
- grep "am__include.*/foobar$i\\." Makefile.in
+ grep "\$(DEPDIR)/foobar$i\\.Po" Makefile.in
done
:
diff --git a/t/subobj11c.sh b/t/subobj11c.sh
index 652a31d56..79abef96c 100644
--- a/t/subobj11c.sh
+++ b/t/subobj11c.sh
@@ -43,6 +43,6 @@ $AUTOMAKE -a
#
# FIXME: Are we sure this is the most sensible output in our situation?
#
-grep '^[^/]*am__include[^/]*//\$(DEPDIR)/zardoz\.[^/]*$' Makefile.in
+grep 'am__depfiles_remade =.* //\$(DEPDIR)/zardoz\.Po' Makefile.in
:
--
cgit v1.2.1
From e3908dd893aadc5e7775ede9a8a24d8667b371b9 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 2 Jan 2015 15:26:12 +0100
Subject: tests: fix some bugs in an XFAILing test
* t/subobj-vpath-pr13928.sh: This one. The test would have failed (or
hung!) even if the bug it was testing against were fixed.
Signed-off-by: Stefano Lattarini
---
t/subobj-vpath-pr13928.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/subobj-vpath-pr13928.sh b/t/subobj-vpath-pr13928.sh
index a10d65776..265832b4f 100644
--- a/t/subobj-vpath-pr13928.sh
+++ b/t/subobj-vpath-pr13928.sh
@@ -33,7 +33,7 @@ AUTOMAKE_OPTIONS = subdir-objects
noinst_PROGRAMS = test
test_SOURCES = $(srcdir)/test.c
test-objs:
- test ! -f $(srcdir)/test.$(OBJEXT)
+ test ! -f '@srcdir@/test.$(OBJEXT)'
test -f test.$(OBJEXT)
END
@@ -42,7 +42,7 @@ $ACLOCAL && $AUTOCONF && $AUTOMAKE -a || fatal_ "autotools failed"
$EGREP 'test\.|DEPDIR|dirstamp|srcdir' Makefile.in || : # For debugging.
$EGREP '\$.srcdir./test\.[o$]' Makefile.in && exit 1
$FGREP '$(srcdir)/$(am__dirstamp)' Makefile.in && exit 1
-$FGREP '$(srcdir)/$(DEPDIR)' && exit 1
+$FGREP '$(srcdir)/$(DEPDIR)' Makefile.in && exit 1
cat > test.c << 'END'
int main (void)
--
cgit v1.2.1
From 1b4c84b80d6099fd6747b129630bbf00c388e0f9 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Fri, 2 Jan 2015 14:47:36 +0100
Subject: compile: don't place built object files in $(srcdir), ever ...
... even when a source file is specified as '$(srdir)/foo.c' or
'$(top_srcdir)/bar.c'. And ditto for dependency-tracking makefile
fragments (those under '.deps' directories).
Such issues used to occur when the 'subdir-objects' option was given.
This change should fix the second and last part of automake bug#13928.
See also bug#16375 and bug#15293.
* NEWS: Update.
* bin/automake.in (handle_single_transform): Make sure object files
and dependency-tracking makefile fragments coming from source like
'$(srcdir)/foo.c' and '$(top_srcdir)/bar.c' are placed respectively
under $(builddir) and $(top_builddir).
* t/subobj-vpath-pr13928.sh: Enhance to expose even more aspects
of the bug we've just fixed.
* t/subobj-pr13928-more-langs.sh: New test, similar to the one above,
but with non-C languages as well.
* t/list-of-tests.mk (XFAIL_TESTS): Remove 'subobj-vpath-pr13928.sh',
it's now supposed to pass.
(handwritten_TESTS): Add 'subobj-pr13928-more-langs.sh'.
Signed-off-by: Stefano Lattarini
---
NEWS | 21 ++++++-
bin/automake.in | 50 ++++++++++-----
t/list-of-tests.mk | 2 +-
t/subobj-pr13928-more-langs.sh | 138 +++++++++++++++++++++++++++++++++++++++++
t/subobj-vpath-pr13928.sh | 89 ++++++++++++++++++++++----
5 files changed, 269 insertions(+), 31 deletions(-)
create mode 100644 t/subobj-pr13928-more-langs.sh
diff --git a/NEWS b/NEWS
index 226f76c66..88597e300 100644
--- a/NEWS
+++ b/NEWS
@@ -67,8 +67,8 @@ New in 1.16:
* Bugs fixed:
- Automatic dependency tracking has been fixed to work also when the
- subdir-object option is used and some 'foo_SOURCES' definition contains
- unexpanded references to make variables, as in, e.g.:
+ 'subdir-object' option is used and some 'foo_SOURCES' definition
+ contains unexpanded references to make variables, as in, e.g.:
a_src = sources/libs/aaa
b_src = sources/bbb
@@ -78,7 +78,7 @@ New in 1.16:
tracking information will be correctly placed under the directories
named 'sources/libs/aaa/.deps' and 'sources/bbb/.deps', rather than
mistakenly under directories named (literally!) '$(src_a)/.deps' and
- '$(src_b)/.deps' (this was automake bug#13928).
+ '$(src_b)/.deps' (this was the first part of automake bug#13928).
Notice that in order to fix this bug we had to slightly change the
semantics of how config.status bootstraps the makefile fragments
@@ -88,6 +88,21 @@ New in 1.16:
using a private target that is only meant to bootstrap the required
makefile fragments.
+ - The 'subdir-object' option no longer causes object files corresponding
+ to source files specified with an explicit '$(srcdir)' component to be
+ placed in the source tree rather than in the build tree.
+
+ For example, if Makefile.am contains:
+
+ AUTOMAKE_OPTIONS = subdir-objects
+ foo_SOURCES = $(srcdir)/foo.c $(srcdir)/s/bar.c $(top_srcdir)/baz.c
+
+ then "make all" will create 'foo.o' and 's/bar.o' in $(builddir) rather
+ than in $(srcdir), and will create 'baz.o' in $(top_builddir) rather
+ than in $(top_srcdir).
+
+ This was the second part of automake bug#13928.
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.15:
diff --git a/bin/automake.in b/bin/automake.in
index 681b3d2a5..dd828da62 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1617,9 +1617,9 @@ sub handle_single_transform
my $renamed = 0;
my ($linker, $object);
- # This records whether we've seen a derived source file (e.g.
- # yacc output).
- my $derived_source = 0;
+ # This records whether we've seen a derived source file (e.g., yacc
+ # or lex output).
+ my $derived_source;
# This holds the 'aggregate context' of the file we are
# currently examining. If the file is compiled with
@@ -1667,17 +1667,36 @@ sub handle_single_transform
# Now extract linker and other info.
$linker = $lang->linker;
- my $this_obj_ext;
- if (defined $source_extension)
- {
- $this_obj_ext = $source_extension;
- $derived_source = 1;
- }
- else
- {
- $this_obj_ext = $obj;
- }
- $object = $base . $this_obj_ext;
+ my $this_obj_ext;
+ if (defined $source_extension)
+ {
+ $this_obj_ext = $source_extension;
+ $derived_source = 1;
+ }
+ else
+ {
+ $this_obj_ext = $obj;
+ $derived_source = 0;
+ # Don't ever place built object files in $(srcdir),
+ # even when sources are specified explicitly as (say)
+ # '$(srcdir)/foo.c' or '$(top_srcdir)/foo.c'.
+ # See automake bug#13928.
+ my @d = split '/', $directory;
+ if (@d > 0 && option 'subdir-objects')
+ {
+ my $d = $d[0];
+ if ($d eq '$(srcdir)' or $d eq '${srcdir}')
+ {
+ shift @d;
+ }
+ elsif ($d eq '$(top_srcdir)' or $d eq '${top_srcdir}')
+ {
+ $d[0] = '$(top_builddir)';
+ }
+ $directory = join '/', @d;
+ }
+ }
+ $object = $base . $this_obj_ext;
if ($have_per_exec_flags)
{
@@ -1710,8 +1729,7 @@ sub handle_single_transform
$renamed = 1;
}
- # If rewrite said it was ok, put the object into a
- # subdir.
+ # If rewrite said it was ok, put the object into a subdir.
if ($directory ne '')
{
if ($r == LANG_SUBDIR)
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 862bb29d2..80d0f0864 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -41,7 +41,6 @@ t/java-nobase.sh \
t/objext-pr10128.sh \
t/remake-timing-bug-pr8365.sh \
t/lex-subobj-nodep.sh \
-t/subobj-vpath-pr13928.sh \
t/remake-am-pr10111.sh \
t/remake-m4-pr10111.sh \
$(perl_fake_XFAIL_TESTS)
@@ -1063,6 +1062,7 @@ t/subobj-clean-pr10697.sh \
t/subobj-clean-lt-pr10697.sh \
t/subobj-indir-pr13928.sh \
t/subobj-vpath-pr13928.sh \
+t/subobj-pr13928-more-langs.sh \
t/subpkg.sh \
t/subpkg2.sh \
t/subpkg3.sh \
diff --git a/t/subobj-pr13928-more-langs.sh b/t/subobj-pr13928-more-langs.sh
new file mode 100644
index 000000000..323e24899
--- /dev/null
+++ b/t/subobj-pr13928-more-langs.sh
@@ -0,0 +1,138 @@
+#! /bin/sh
+# Copyright (C) 2015 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+# Expose part of automake bug#13928, also for non-C languages: if the
+# subdir-objects option is in use and a source file is listed in a
+# _SOURCES variable with a leading $(srcdir) component, Automake will
+# generate a Makefile that tries to create the corresponding object
+# file in $(srcdir) as well.
+
+required='cc c++ fortran77 fortran'
+. test-init.sh
+
+cat >> configure.ac <<'END'
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_F77
+AC_PROG_FC
+AM_CONDITIONAL([OBVIOUS], [:])
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = subdir-objects
+SUBDIRS = sub
+
+LESS = m/o/r/e
+
+noinst_PROGRAMS = test test2
+test_SOURCES = $(srcdir)/test.f90
+
+test2_SOURCES = $(indir)
+
+indir = ${indir2} $(empty)
+indir2 =
+if OBVIOUS
+indir2 += ${srcdir}/$(LESS)///test.f
+else
+endif
+
+test-objs:
+ ls -la @srcdir@ .
+ :
+ test ! -f @srcdir@/test.$(OBJEXT)
+ test -f test.$(OBJEXT)
+ test ! -f @srcdir@/m/o/r/e/test.$(OBJEXT)
+ test -f m/o/r/e/test.$(OBJEXT)
+ :
+ test ! -f @srcdir@/bar.$(OBJEXT)
+ test -f bar.$(OBJEXT)
+ test ! -f @srcdir@/baz.$(OBJEXT)
+ test -f baz.$(OBJEXT)
+ :
+ test ! -d @srcdir@/$(DEPDIR)
+ test ! -d @srcdir@/m/o/r/e/$(DEPDIR)
+ test -d $(DEPDIR)
+ test -d m/o/r/e/$(DEPDIR)
+
+check-local: test-objs
+END
+
+mkdir sub
+cat > sub/Makefile.am <<'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = foo
+foo = baz
+foo_SOURCES = foo.h \
+ $(top_srcdir)/bar.cc \
+ ${top_srcdir}/$(foo).c
+END
+
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+mkfiles='Makefile.in sub/Makefile.in'
+$EGREP '(test|ba[rz])\.|DEPDIR|dirstamp|srcdir' $mkfiles # For debugging.
+$EGREP '\$.(top_)?srcdir./(test|ba[rz]|\$.foo.)\.[o$]' $mkfiles && exit 1
+$FGREP '\$.(top_)?srcdir./.*$(am__dirstamp)' $mkfiles && exit 1
+$FGREP '\$.(top_)?srcdir./.*$(DEPDIR)' $mkfiles && exit 1
+
+cat > test.f90 <<'EOF'
+ program foo
+ stop
+ end
+EOF
+
+mkdir -p m/o/r/e
+cp test.f90 m/o/r/e/test.f
+
+cat > sub/foo.h <<'END'
+#ifdef __cplusplus
+extern "C"
+#endif
+int foo (void);
+END
+
+cat > bar.cc <<'END'
+#include "foo.h"
+#include
+int main (void)
+{
+ std::cout << "OK!" << "\n";
+ return foo ();
+}
+END
+
+cat > baz.c <<'END'
+#include "foo.h"
+int foo (void)
+{
+ return 0;
+}
+END
+
+mkdir build
+cd build
+../configure
+
+$MAKE
+$MAKE test-objs
+$MAKE distcheck
+
+:
diff --git a/t/subobj-vpath-pr13928.sh b/t/subobj-vpath-pr13928.sh
index 265832b4f..a7db9d8ad 100644
--- a/t/subobj-vpath-pr13928.sh
+++ b/t/subobj-vpath-pr13928.sh
@@ -22,39 +22,106 @@
required=cc
. test-init.sh
-cat >> configure.ac << 'END'
+cat >> configure.ac <<'END'
AC_PROG_CC
AM_PROG_CC_C_O
+AM_CONDITIONAL([OBVIOUS], [:])
+AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
cat > Makefile.am <<'END'
AUTOMAKE_OPTIONS = subdir-objects
-noinst_PROGRAMS = test
+SUBDIRS = sub
+
+LESS = more
+
+noinst_PROGRAMS = test test2
test_SOURCES = $(srcdir)/test.c
+
+test2_SOURCES = $(indir)
+
+indir =
+if OBVIOUS
+indir += ${srcdir}/$(LESS)/test.c
+else
+endif
+
test-objs:
- test ! -f '@srcdir@/test.$(OBJEXT)'
+ ls -la @srcdir@ .
+ :
+ test ! -f @srcdir@/test.$(OBJEXT)
test -f test.$(OBJEXT)
+ test ! -f @srcdir@/more/test.$(OBJEXT)
+ test -f more/test.$(OBJEXT)
+ :
+ test ! -f @srcdir@/bar.$(OBJEXT)
+ test -f bar.$(OBJEXT)
+ test ! -f @srcdir@/baz.$(OBJEXT)
+ test -f baz.$(OBJEXT)
+ :
+ test ! -d @srcdir@/$(DEPDIR)
+ test ! -d @srcdir@/more/$(DEPDIR)
+ test -d $(DEPDIR)
+ test -d more/$(DEPDIR)
+
+check-local: test-objs
+END
+
+mkdir sub
+cat > sub/Makefile.am <<'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = foo
+foo_SOURCES = foo.h \
+ $(top_srcdir)/bar.c \
+ ${top_srcdir}/baz.c
+END
+
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+mkfiles='Makefile.in sub/Makefile.in'
+$EGREP '(test|ba[rz])\.|DEPDIR|dirstamp|srcdir' $mkfiles # For debugging.
+$EGREP '\$.(top_)?srcdir./(test|ba[rz])\.[o$]' $mkfiles && exit 1
+$FGREP '\$.(top_)?srcdir./.*$(am__dirstamp)' $mkfiles && exit 1
+$FGREP '\$.(top_)?srcdir./.*$(DEPDIR)' $mkfiles && exit 1
+
+cat > test.c <<'END'
+int main (void)
+{
+ return 0;
+}
END
-$ACLOCAL && $AUTOCONF && $AUTOMAKE -a || fatal_ "autotools failed"
+mkdir more
+cp test.c more/test.c
-$EGREP 'test\.|DEPDIR|dirstamp|srcdir' Makefile.in || : # For debugging.
-$EGREP '\$.srcdir./test\.[o$]' Makefile.in && exit 1
-$FGREP '$(srcdir)/$(am__dirstamp)' Makefile.in && exit 1
-$FGREP '$(srcdir)/$(DEPDIR)' Makefile.in && exit 1
+echo 'int foo (void);' > sub/foo.h
-cat > test.c << 'END'
+cat > bar.c <<'END'
+#include "foo.h"
int main (void)
+{
+ return foo ();
+}
+END
+
+cat > baz.c <<'END'
+#include "foo.h"
+int foo (void)
{
return 0;
}
END
-mkdir build && cd build || fatal "preparation of build directory failed"
-../configure || fatal_ "./configure failed"
+mkdir build
+cd build
+../configure
$MAKE
$MAKE test-objs
+$MAKE distcheck
:
--
cgit v1.2.1
From 08849db866b44510f6b8fd49e313c91a43a3dfd3 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini
Date: Sat, 3 Jan 2015 01:33:45 +0100
Subject: deps: fix corner-case "make distclean" bug
Assume we have package satisfying the following conditions:
(1) automatic dependency tracking is enabled;
(2) the 'subdir-objects' Automake option is enabled;
(3) the package uses a recursive make setup.
Also assume that:
(a) a subdir Makefile declares a foo_SOURCES variable containing
a source file in the parent directory;
(b) that parent Makefile declare a compiled program itself.
Then BSD and Solaris make used to fail when running "make distclean",
because the 'distclean' target of the subdir Makefile removed the
whole '.deps' directory before the parent Makefile was done with the
included '.Po' makefile fragments in that directory. This issue was
revealed by failures in the 'subobj-vpath-pr13928.sh' test when those
make implementations were used.
We fix the issue by ensuring the 'distclean' target of any Makefile
only removed the '.Po' makefile fragments included by it, rather than
the whole '.deps' directory where such files resides.
This change should be the last step in fixing automake bug#13928
for good.
* bin/automake.in (handle_languages), lib/am/depend.am: Adjust
to implement the new 'distclean' logic.
* t/pr224.sh: Adjust to avoid a spurious failure.
* PLANS/subdir-objects.txt: Update.
Signed-off-by: Stefano Lattarini
---
PLANS/subdir-objects.txt | 10 +++-------
bin/automake.in | 20 ++++++++++----------
lib/am/depend.am | 7 ++++---
t/pr224.sh | 4 ++--
4 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/PLANS/subdir-objects.txt b/PLANS/subdir-objects.txt
index 3cf610124..c849e338e 100644
--- a/PLANS/subdir-objects.txt
+++ b/PLANS/subdir-objects.txt
@@ -5,9 +5,6 @@ We want to make the behaviour currently enabled by the 'subdir-objects'
the default one, and in fact the *only* one, in Automake 2.0.
See automake bug#13378: .
-Sadly, **THIS IS IMPOSSIBLE** until automake bug#13928 is resolved:
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928
-
Details
-------
@@ -53,11 +50,10 @@ We also make sure to avoid the warning when it would be irrelevant, i.e.,
if all source files sit in "current" directory (thanks to Peter Johansson
for suggesting this).
-For some automake 1.x (*before* 2.0 can be released)
-----------------------------------------------------
+For automake 1.16 (*before* 2.0 can be released)
+------------------------------------------------
-Find a proper way to fix the blocking automake bug#13928:
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928
+Submit the pending patch series that fixes http://debbugs.gnu.org/13928
For automake 2.0
----------------
diff --git a/bin/automake.in b/bin/automake.in
index dd828da62..355d7ff30 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1242,14 +1242,16 @@ sub handle_languages ()
INTERNAL);
define_variable ('am__maybe_remake_depfiles', 'depfiles', INTERNAL);
define_variable ('am__depfiles_remade', "@dep_files", INTERNAL);
- # Generate each 'include' directive individually. Several make
- # implementations (IRIX 6, Solaris 10, FreeBSD 8) will fail to
- # properly include several files resulting from a variable
- # expansion. Just Generating many separate includes seems thus
- # safest.
$output_rules .= "\n";
+ my @dist_rms;
foreach my $depfile (@dep_files)
{
+ push @dist_rms, "\t-rm -f $depfile";
+ # Generate each 'include' directive individually. Several
+ # make implementations (IRIX 6, Solaris 10, FreeBSD 8) will
+ # fail to properly include several files resulting from a
+ # variable expansion. Just Generating many separate includes
+ # seems thus safest.
$output_rules .= subst ('AMDEP_TRUE') .
subst ('am__include') .
" " .
@@ -1262,11 +1264,9 @@ sub handle_languages ()
require_conf_file ("$am_file.am", FOREIGN, 'depcomp');
- # Compute the set of directories to remove in distclean-depend.
- my @dep_dirs = uniq (map { dirname ($_) } @dep_files);
- $output_rules .= file_contents ('depend',
- new Automake::Location,
- DEPDIRS => "@dep_dirs");
+ $output_rules .= file_contents (
+ 'depend', new Automake::Location,
+ 'DISTRMS' => join ("\n", @dist_rms));
}
}
else
diff --git a/lib/am/depend.am b/lib/am/depend.am
index 3711d5d12..7fb8bb9be 100644
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -27,8 +27,9 @@ am--depfiles: $(am__depfiles_remade)
## erase them in -am or -recursive rules; that would prevent any other
## rules from being recursive (for instance multilib clean rules are
## recursive).
+if %?DISTRMS%
distclean:
- -rm -rf %DEPDIRS%
-
+ %DISTRMS%
maintainer-clean:
- -rm -rf %DEPDIRS%
+ %DISTRMS%
+endif
diff --git a/t/pr224.sh b/t/pr224.sh
index 7d907441c..bca1d3037 100644
--- a/t/pr224.sh
+++ b/t/pr224.sh
@@ -56,8 +56,8 @@ cd build
../configure
$MAKE
-test -d foo/.deps
+test -f foo/.deps/main.Po
$MAKE distclean
-test -d foo/.deps && exit 1
+test ! -e foo/.deps/main.Po
:
--
cgit v1.2.1
From 5fac9a39d45e761f2b27262c4fd13ccb3ff8dc9b Mon Sep 17 00:00:00 2001
From: Jim Meyering
Date: Mon, 30 May 2016 17:07:52 -0700
Subject: compile: remove .Tpo file upon failure
When generating a .deps/base.Po file, our emitted rule first writes
to a temporary .Tpo file, so the final creation can be atomic, via
mv's rename. However, when generation of the .Tpo fails, it stop the
process and does not remove that temporary file. And nothing else
ever deletes it, either. Hence, in the unusual case in which one
expects a compilation to fail during a successful build (gnulib's
test-verify.sh does precisely this), a .deps/test-verify.Tpo file
would be left behind, and that would in turn cause a "make distcheck"
failure because that file would exist in one build+distclean hierarchy
but not in the distribution tarball.
* lib/am/depend2.am: Ensure that the temporary file is removed
upon failure.
* t/distcheck-Tpo.sh: New file.
* t/list-of-tests.mk (handwritten_TESTS): Add it.
This addresses bug#23661.
---
lib/am/depend2.am | 10 ++++++----
t/distcheck-Tpo.sh | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
t/list-of-tests.mk | 1 +
3 files changed, 65 insertions(+), 4 deletions(-)
create mode 100644 t/distcheck-Tpo.sh
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 87f62a80d..d1478b916 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -42,8 +42,9 @@ if %?NONLIBTOOL%
?!GENERIC?%OBJ%: %SOURCE%
if %FASTDEP%
%VERBOSE%$(am__set_depbase) && \
- %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% %XSOURCE% && \
- $(am__mv) $$depbase.Tpo $$depbase.Po
+ %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% %XSOURCE%; \
+ if test $$? = 0; then $(am__mv) $$depbase.Tpo $$depbase.Po; \
+ else rm -f $$depbase.Tpo; false; fi
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -56,8 +57,9 @@ endif !%FASTDEP%
?!GENERIC?%OBJOBJ%: %SOURCE%
if %FASTDEP%
%VERBOSE%$(am__set_depbase) && \
- %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% $$($(CYGPATH_W) %XSOURCE%) && \
- $(am__mv) $$depbase.Tpo $$depbase.Po
+ %COMPILE% -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ %SOURCEFLAG% $$($(CYGPATH_W) %XSOURCE%); \
+ if test $$? = 0; then $(am__mv) $$depbase.Tpo $$depbase.Po; \
+ else rm -f $$depbase.Tpo; false; fi
else !%FASTDEP%
if %AMDEP%
%VERBOSE%source='%SOURCE%' object='$@' libtool=no @AMDEPBACKSLASH@
diff --git a/t/distcheck-Tpo.sh b/t/distcheck-Tpo.sh
new file mode 100644
index 000000000..9d7900cb4
--- /dev/null
+++ b/t/distcheck-Tpo.sh
@@ -0,0 +1,58 @@
+#! /bin/sh
+# Copyright (C) 2016 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+# Ensure that the 'make distcheck'-run distcleancheck does not fail
+# due to a leftover .deps/base.Tpo file when part of a successful build
+# involves a failed attempt to create a .deps/base.Po file.
+
+. test-init.sh
+
+cat >> configure.ac < foo.c <<\END
+#ifndef FAIL
+int main() { return 0; }
+#else
+int x[no_such];
+#endif
+END
+
+cat > Makefile.am <<\END
+TESTS = foo bar.test
+check_PROGRAMS = foo
+EXTRA_DIST= bar.test foo.c
+END
+
+cat > bar.test <
Date: Sun, 1 Jan 2017 08:34:49 -0800
Subject: maint: update copyright dates for 2017
* all files: Run this command, using update-copyright from gnulib:
UPDATE_COPYRIGHT_FORCE=1 \
UPDATE_COPYRIGHT_USE_INTERVALS=2 \
UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79 \
update-copyright $(git ls-files)
---
COPYING | 2 +-
GNUmakefile | 2 +-
HACKING | 2 +-
INSTALL | 3 +--
Makefile.am | 2 +-
NEWS | 2 +-
README | 2 +-
bin/Makefile.inc | 2 +-
bin/aclocal.in | 2 +-
bin/automake.in | 2 +-
bin/gen-perl-protos | 2 +-
bootstrap.sh | 2 +-
configure.ac | 2 +-
contrib/check-html.am | 2 +-
contrib/multilib/config-ml.in | 2 +-
contrib/multilib/multi.m4 | 2 +-
contrib/multilib/multilib.am | 2 +-
contrib/multilib/symlink-tree | 2 +-
contrib/t/Makefile.inc | 2 +-
contrib/t/help-multilib.sh | 2 +-
contrib/t/multilib.sh | 2 +-
contrib/t/parallel-tests-html-recursive.sh | 2 +-
contrib/t/parallel-tests-html.sh | 2 +-
contrib/tap-driver.pl | 2 +-
doc/Makefile.inc | 2 +-
doc/amhello/Makefile.am | 2 +-
doc/amhello/configure.ac | 2 +-
doc/amhello/src/Makefile.am | 2 +-
doc/amhello/src/main.c | 2 +-
doc/automake-history.texi | 2 +-
doc/automake.texi | 2 +-
doc/fdl.texi | 2 +-
doc/help2man | 2 +-
gen-testsuite-part | 2 +-
lib/Automake/ChannelDefs.pm | 2 +-
lib/Automake/Channels.pm | 2 +-
lib/Automake/Condition.pm | 2 +-
lib/Automake/Config.in | 2 +-
lib/Automake/DisjConditions.pm | 2 +-
lib/Automake/FileUtils.pm | 2 +-
lib/Automake/General.pm | 2 +-
lib/Automake/Getopt.pm | 2 +-
lib/Automake/Item.pm | 2 +-
lib/Automake/ItemDef.pm | 2 +-
lib/Automake/Language.pm | 2 +-
lib/Automake/Location.pm | 2 +-
lib/Automake/Makefile.inc | 2 +-
lib/Automake/Options.pm | 2 +-
lib/Automake/Rule.pm | 2 +-
lib/Automake/RuleDef.pm | 2 +-
lib/Automake/VarDef.pm | 2 +-
lib/Automake/Variable.pm | 2 +-
lib/Automake/Version.pm | 2 +-
lib/Automake/Wrap.pm | 2 +-
lib/Automake/XFile.pm | 2 +-
lib/COPYING | 2 +-
lib/INSTALL | 3 +--
lib/Makefile.inc | 2 +-
lib/am/Makefile.inc | 2 +-
lib/am/check.am | 2 +-
lib/am/check2.am | 2 +-
lib/am/clean-hdr.am | 2 +-
lib/am/clean.am | 2 +-
lib/am/compile.am | 2 +-
lib/am/configure.am | 2 +-
lib/am/data.am | 2 +-
lib/am/dejagnu.am | 2 +-
lib/am/depend.am | 2 +-
lib/am/depend2.am | 2 +-
lib/am/distdir.am | 2 +-
lib/am/footer.am | 2 +-
lib/am/header-vars.am | 2 +-
lib/am/header.am | 2 +-
lib/am/inst-vars.am | 2 +-
lib/am/install.am | 2 +-
lib/am/java.am | 2 +-
lib/am/lang-compile.am | 2 +-
lib/am/lex.am | 2 +-
lib/am/library.am | 2 +-
lib/am/libs.am | 2 +-
lib/am/libtool.am | 2 +-
lib/am/lisp.am | 2 +-
lib/am/ltlib.am | 2 +-
lib/am/ltlibrary.am | 2 +-
lib/am/mans-vars.am | 2 +-
lib/am/mans.am | 2 +-
lib/am/program.am | 2 +-
lib/am/progs.am | 2 +-
lib/am/python.am | 2 +-
lib/am/remake-hdr.am | 2 +-
lib/am/scripts.am | 2 +-
lib/am/subdirs.am | 2 +-
lib/am/tags.am | 2 +-
lib/am/texi-vers.am | 2 +-
lib/am/texibuild.am | 2 +-
lib/am/texinfos.am | 2 +-
lib/am/vala.am | 2 +-
lib/am/yacc.am | 2 +-
lib/ar-lib | 2 +-
lib/compile | 2 +-
lib/config.guess | 2 +-
lib/config.sub | 2 +-
lib/depcomp | 2 +-
lib/gendocs.sh | 3 +--
lib/gendocs_template | 2 +-
lib/gitlog-to-changelog | 2 +-
lib/gnupload | 2 +-
lib/mdate-sh | 2 +-
lib/missing | 2 +-
lib/py-compile | 2 +-
lib/tap-driver.sh | 2 +-
lib/test-driver | 2 +-
lib/texinfo.tex | 4 +---
lib/update-copyright | 2 +-
lib/ylwrap | 2 +-
m4/Makefile.inc | 2 +-
m4/amversion.in | 2 +-
m4/amversion.m4 | 2 +-
m4/ar-lib.m4 | 2 +-
m4/as.m4 | 2 +-
m4/auxdir.m4 | 2 +-
m4/cond-if.m4 | 2 +-
m4/cond.m4 | 2 +-
m4/depend.m4 | 2 +-
m4/depout.m4 | 2 +-
m4/dmalloc.m4 | 2 +-
m4/extra-recurs.m4 | 2 +-
m4/gcj.m4 | 2 +-
m4/init.m4 | 2 +-
m4/install-sh.m4 | 2 +-
m4/internal/ac-config-macro-dirs.m4 | 2 +-
m4/lex.m4 | 2 +-
m4/lispdir.m4 | 2 +-
m4/maintainer.m4 | 2 +-
m4/make.m4 | 2 +-
m4/missing.m4 | 2 +-
m4/obsolete.m4 | 2 +-
m4/options.m4 | 2 +-
m4/prog-cc-c-o.m4 | 2 +-
m4/python.m4 | 2 +-
m4/runlog.m4 | 2 +-
m4/sanity.m4 | 2 +-
m4/silent.m4 | 2 +-
m4/strip.m4 | 2 +-
m4/substnot.m4 | 2 +-
m4/tar.m4 | 2 +-
m4/upc.m4 | 2 +-
m4/vala.m4 | 2 +-
maintainer/am-ft | 2 +-
maintainer/am-xft | 2 +-
maintainer/maint.mk | 2 +-
maintainer/rename-tests | 2 +-
maintainer/syntax-checks.mk | 2 +-
old/ChangeLog-tests | 2 +-
old/ChangeLog.00 | 2 +-
old/ChangeLog.01 | 2 +-
old/ChangeLog.02 | 2 +-
old/ChangeLog.03 | 2 +-
old/ChangeLog.04 | 2 +-
old/ChangeLog.09 | 2 +-
old/ChangeLog.11 | 2 +-
old/ChangeLog.96 | 2 +-
old/ChangeLog.98 | 2 +-
old/TODO | 2 +-
t/CheckListOfTests.am | 2 +-
t/Makefile.inc | 2 +-
t/ac-output-old.tap | 2 +-
t/aclocal-I-and-install.sh | 2 +-
t/aclocal-I-order-1.sh | 2 +-
t/aclocal-I-order-2.sh | 2 +-
t/aclocal-I-order-3.sh | 2 +-
t/aclocal-acdir.sh | 2 +-
t/aclocal-amflags.sh | 2 +-
t/aclocal-autoconf-version-check.sh | 2 +-
t/aclocal-comments-respected.sh | 2 +-
t/aclocal-deleted-header-aclocal-amflags.sh | 2 +-
t/aclocal-deleted-header.sh | 2 +-
t/aclocal-deps-subdir.sh | 2 +-
t/aclocal-deps.sh | 2 +-
t/aclocal-dirlist-abspath.sh | 2 +-
t/aclocal-dirlist-globbing.sh | 2 +-
t/aclocal-dirlist.sh | 2 +-
t/aclocal-install-absdir.sh | 2 +-
t/aclocal-install-fail.sh | 2 +-
t/aclocal-install-mkdir.sh | 2 +-
t/aclocal-m4-include-are-scanned-aclocal-amflags.sh | 2 +-
t/aclocal-m4-include-are-scanned.sh | 2 +-
t/aclocal-m4-sinclude.sh | 2 +-
t/aclocal-macrodir.tap | 2 +-
t/aclocal-macrodirs.tap | 2 +-
t/aclocal-missing-macros.sh | 2 +-
t/aclocal-no-extra-scan.sh | 2 +-
t/aclocal-no-force.sh | 2 +-
t/aclocal-no-install-no-mkdir.sh | 2 +-
t/aclocal-no-symlinked-overwrite.sh | 2 +-
t/aclocal-no-unused-required.sh | 2 +-
t/aclocal-path-install-serial.sh | 2 +-
t/aclocal-path-install.sh | 2 +-
t/aclocal-path-nonexistent.sh | 2 +-
t/aclocal-path-precedence.sh | 2 +-
t/aclocal-path.sh | 2 +-
t/aclocal-pr450.sh | 2 +-
t/aclocal-print-acdir.sh | 2 +-
t/aclocal-remake-misc.sh | 2 +-
t/aclocal-req.sh | 2 +-
t/aclocal-scan-configure-ac-pr319.sh | 2 +-
t/aclocal-serial.sh | 2 +-
t/aclocal-underquoted-defun.sh | 2 +-
t/aclocal-verbose-install.sh | 2 +-
t/aclocal.sh | 2 +-
t/acsilent.sh | 2 +-
t/acsubst.sh | 2 +-
t/acsubst2.sh | 2 +-
t/add-missing-install-sh.sh | 2 +-
t/add-missing-multiple.sh | 2 +-
t/add-missing.tap | 2 +-
t/all.sh | 2 +-
t/all2.sh | 2 +-
t/alloca.sh | 2 +-
t/alloca2.sh | 2 +-
t/alpha.sh | 2 +-
t/alpha2.sh | 2 +-
t/am-config-header.sh | 2 +-
t/am-default-source-ext.sh | 2 +-
t/am-include-only-one-generated-fragment.sh | 2 +-
t/am-macro-not-found.sh | 2 +-
t/am-missing-prog.sh | 2 +-
t/am-prog-cc-c-o.sh | 2 +-
t/am-prog-cc-stdc.sh | 2 +-
t/am-prog-mkdir-p.sh | 2 +-
t/am-tests-environment.sh | 2 +-
t/amassign.sh | 2 +-
t/amhello-binpkg.sh | 2 +-
t/amhello-cflags.sh | 2 +-
t/amhello-cross-compile.sh | 2 +-
t/aminit-moreargs-deprecation.sh | 2 +-
t/aminit-trailing-dnl-comment-pr16841.sh | 2 +-
t/amopt.sh | 2 +-
t/amopts-location.sh | 2 +-
t/amopts-variable-expansion.sh | 2 +-
t/amsubst.sh | 2 +-
t/ansi2knr-no-more.sh | 2 +-
t/ar-lib.sh | 2 +-
t/ar-lib2.sh | 2 +-
t/ar-lib3.sh | 2 +-
t/ar-lib4.sh | 2 +-
t/ar-lib5a.sh | 2 +-
t/ar-lib5b.sh | 2 +-
t/ar-lib6a.sh | 2 +-
t/ar-lib6b.sh | 2 +-
t/ar-lib7.sh | 2 +-
t/ar.sh | 2 +-
t/ar2.sh | 2 +-
t/ar3.sh | 2 +-
t/ar4.sh | 2 +-
t/ar5.sh | 2 +-
t/asm.sh | 2 +-
t/asm2.sh | 2 +-
t/asm3.sh | 2 +-
t/autodist-acconfig-no-subdir.sh | 2 +-
t/autodist-acconfig.sh | 2 +-
t/autodist-aclocal-m4.sh | 2 +-
t/autodist-config-headers.sh | 2 +-
t/autodist-configure-no-subdir.sh | 2 +-
t/autodist-no-duplicate.sh | 2 +-
t/autodist-stamp-vti.sh | 2 +-
t/autodist-subdir.sh | 2 +-
t/autodist.sh | 2 +-
t/autohdr-subdir-pr12495.sh | 2 +-
t/autohdr.sh | 2 +-
t/autohdr3.sh | 2 +-
t/autohdr4.sh | 2 +-
t/autohdrdry.sh | 2 +-
t/automake-cmdline.tap | 2 +-
t/auxdir-autodetect.sh | 2 +-
t/auxdir-cc-pr15981.sh | 2 +-
t/auxdir-computed.tap | 2 +-
t/auxdir-misplaced.sh | 2 +-
t/auxdir-nonexistent.sh | 2 +-
t/auxdir-pr15981.sh | 2 +-
t/auxdir-pr19311.sh | 2 +-
t/auxdir-unportable.tap | 2 +-
t/auxdir.sh | 2 +-
t/auxdir6.sh | 2 +-
t/auxdir7.sh | 2 +-
t/auxdir8.sh | 2 +-
t/ax/am-test-lib.sh | 2 +-
t/ax/cc-no-c-o.in | 2 +-
t/ax/deltree.pl | 2 +-
t/ax/depcomp.sh | 2 +-
t/ax/distcheck-hook-m4.am | 2 +-
t/ax/extract-testsuite-summary.pl | 2 +-
t/ax/is | 2 +-
t/ax/is_newest | 2 +-
t/ax/runtest.in | 2 +-
t/ax/shell-no-trail-bslash.in | 2 +-
t/ax/tap-functions.sh | 2 +-
t/ax/tap-setup.sh | 2 +-
t/ax/tap-summary-aux.sh | 2 +-
t/ax/test-defs.in | 2 +-
t/ax/test-init.sh | 2 +-
t/ax/test-lib.sh | 2 +-
t/ax/testsuite-summary-checks.sh | 2 +-
t/ax/trivial-test-driver | 2 +-
t/backcompat-acout.sh | 2 +-
t/backcompat.sh | 2 +-
t/backcompat2.sh | 2 +-
t/backcompat3.sh | 2 +-
t/backcompat6.sh | 2 +-
t/backslash-before-trailing-whitespace.sh | 2 +-
t/backslash-issues.sh | 2 +-
t/badline.sh | 2 +-
t/badopt.sh | 2 +-
t/badprog.sh | 2 +-
t/built-sources-check.sh | 2 +-
t/built-sources-cond.sh | 2 +-
t/built-sources-fork-bomb.sh | 2 +-
t/built-sources-install.sh | 2 +-
t/built-sources-subdir.sh | 2 +-
t/built-sources.sh | 2 +-
t/c-demo.sh | 2 +-
t/candist.sh | 2 +-
t/canon-name.sh | 2 +-
t/canon.sh | 2 +-
t/canon2.sh | 2 +-
t/canon3.sh | 2 +-
t/canon4.sh | 2 +-
t/canon5.sh | 2 +-
t/canon6.sh | 2 +-
t/canon7.sh | 2 +-
t/canon8.sh | 2 +-
t/ccnoco-deps.sh | 2 +-
t/ccnoco-lib.sh | 2 +-
t/ccnoco-lt.sh | 2 +-
t/ccnoco.sh | 2 +-
t/ccnoco3.sh | 2 +-
t/ccnoco4.sh | 2 +-
t/check-concurrency-bug9245.sh | 2 +-
t/check-exported-srcdir.sh | 2 +-
t/check-fd-redirect.sh | 2 +-
t/check-no-test-driver.sh | 2 +-
t/check-subst-prog.sh | 2 +-
t/check-subst.sh | 2 +-
t/check-tests-in-builddir.sh | 2 +-
t/check.sh | 2 +-
t/check10.sh | 2 +-
t/check11.sh | 2 +-
t/check12.sh | 2 +-
t/check2.sh | 2 +-
t/check4.sh | 2 +-
t/check5.sh | 2 +-
t/check6.sh | 2 +-
t/check7.sh | 2 +-
t/check8.sh | 2 +-
t/checkall.sh | 2 +-
t/clean.sh | 2 +-
t/colneq.sh | 2 +-
t/colneq2.sh | 2 +-
t/colneq3.sh | 2 +-
t/colon.sh | 2 +-
t/colon2.sh | 2 +-
t/colon3.sh | 2 +-
t/colon4.sh | 2 +-
t/colon5.sh | 2 +-
t/colon6.sh | 2 +-
t/colon7.sh | 2 +-
t/color-tests-opt.sh | 2 +-
t/color-tests.sh | 2 +-
t/color-tests2.sh | 2 +-
t/commen10.sh | 2 +-
t/commen11.sh | 2 +-
t/comment-block.sh | 2 +-
t/comment.sh | 2 +-
t/comment2.sh | 2 +-
t/comment3.sh | 2 +-
t/comment4.sh | 2 +-
t/comment5.sh | 2 +-
t/comment6.sh | 2 +-
t/comment7.sh | 2 +-
t/comment8.sh | 2 +-
t/comment9.sh | 2 +-
t/comments-in-var-def.sh | 2 +-
t/compile.sh | 2 +-
t/compile2.sh | 2 +-
t/compile3.sh | 2 +-
t/compile4.sh | 2 +-
t/compile5.sh | 2 +-
t/compile6.sh | 2 +-
t/compile7.sh | 2 +-
t/compile_f90_c_cxx.sh | 2 +-
t/compile_f_c_cxx.sh | 2 +-
t/cond-basic.sh | 2 +-
t/cond.sh | 2 +-
t/cond10.sh | 2 +-
t/cond11.sh | 2 +-
t/cond13.sh | 2 +-
t/cond14.sh | 2 +-
t/cond15.sh | 2 +-
t/cond16.sh | 2 +-
t/cond17.sh | 2 +-
t/cond18.sh | 2 +-
t/cond19.sh | 2 +-
t/cond20.sh | 2 +-
t/cond21.sh | 2 +-
t/cond22.sh | 2 +-
t/cond23.sh | 2 +-
t/cond24.sh | 2 +-
t/cond25.sh | 2 +-
t/cond26.sh | 2 +-
t/cond27.sh | 2 +-
t/cond28.sh | 2 +-
t/cond3.sh | 2 +-
t/cond30.sh | 2 +-
t/cond31.sh | 2 +-
t/cond32.sh | 2 +-
t/cond33.sh | 2 +-
t/cond34.sh | 2 +-
t/cond35.sh | 2 +-
t/cond36.sh | 2 +-
t/cond37.sh | 2 +-
t/cond38.sh | 2 +-
t/cond39.sh | 2 +-
t/cond4.sh | 2 +-
t/cond40.sh | 2 +-
t/cond41.sh | 2 +-
t/cond42.sh | 2 +-
t/cond43.sh | 2 +-
t/cond44.sh | 2 +-
t/cond45.sh | 2 +-
t/cond46.sh | 2 +-
t/cond5.sh | 2 +-
t/cond6.sh | 2 +-
t/cond7.sh | 2 +-
t/cond8.sh | 2 +-
t/cond9.sh | 2 +-
t/condd.sh | 2 +-
t/condhook.sh | 2 +-
t/condhook2.sh | 2 +-
t/condinc.sh | 2 +-
t/condinc2.sh | 2 +-
t/condlib.sh | 2 +-
t/condman2.sh | 2 +-
t/condman3.sh | 2 +-
t/confdeps.sh | 2 +-
t/conff.sh | 2 +-
t/conff2.sh | 2 +-
t/conffile-leading-dot.sh | 2 +-
t/confh-subdir-clean.sh | 2 +-
t/confh.sh | 2 +-
t/confh4.sh | 2 +-
t/confh5.sh | 2 +-
t/confh6.sh | 2 +-
t/confh7.sh | 2 +-
t/confh8.sh | 2 +-
t/confincl.sh | 2 +-
t/conflnk.sh | 2 +-
t/conflnk2.sh | 2 +-
t/conflnk3.sh | 2 +-
t/conflnk4.sh | 2 +-
t/confsub.sh | 2 +-
t/confvar.sh | 2 +-
t/confvar2.sh | 2 +-
t/copy.sh | 2 +-
t/cscope.tap | 2 +-
t/cscope2.sh | 2 +-
t/cscope3.sh | 2 +-
t/cxx-demo.sh | 2 +-
t/cxx-lt-demo.sh | 2 +-
t/cxx.sh | 2 +-
t/cxx2.sh | 2 +-
t/cxxcpp.sh | 2 +-
t/cxxlibobj.sh | 2 +-
t/cxxlink.sh | 2 +-
t/cxxnoc.sh | 2 +-
t/cygnus-no-more.sh | 2 +-
t/cygwin32.sh | 2 +-
t/dash.sh | 2 +-
t/defun.sh | 2 +-
t/defun2.sh | 2 +-
t/dejagnu-absolute-builddir.sh | 2 +-
t/dejagnu-relative-srcdir.sh | 2 +-
t/dejagnu-siteexp-append.sh | 2 +-
t/dejagnu-siteexp-extend.sh | 2 +-
t/dejagnu-siteexp-useredit.sh | 2 +-
t/dejagnu.sh | 2 +-
t/dejagnu2.sh | 2 +-
t/dejagnu3.sh | 2 +-
t/dejagnu4.sh | 2 +-
t/dejagnu5.sh | 2 +-
t/dejagnu6.sh | 2 +-
t/dejagnu7.sh | 2 +-
t/deleted-am.sh | 2 +-
t/deleted-m4.sh | 2 +-
t/depacl2.sh | 2 +-
t/depcomp-implicit-auxdir.sh | 2 +-
t/depcomp.sh | 2 +-
t/depcomp2.sh | 2 +-
t/depcomp8a.sh | 2 +-
t/depcomp8b.sh | 2 +-
t/depdist.sh | 2 +-
t/depend-postproc.sh | 2 +-
t/depend.sh | 2 +-
t/depend3.sh | 2 +-
t/depend4.sh | 2 +-
t/depend5.sh | 2 +-
t/depend6.sh | 2 +-
t/deprecated-acinit.sh | 2 +-
t/destdir.sh | 2 +-
t/dir-named-obj-is-bad.sh | 2 +-
t/discover.sh | 2 +-
t/dist-auxdir-many-subdirs.sh | 2 +-
t/dist-auxfile-2.sh | 2 +-
t/dist-auxfile.sh | 2 +-
t/dist-formats.tap | 2 +-
t/dist-included-parent-dir.sh | 2 +-
t/dist-install-sh.sh | 2 +-
t/dist-lzma.sh | 2 +-
t/dist-missing-am.sh | 2 +-
t/dist-missing-included-m4.sh | 2 +-
t/dist-missing-m4.sh | 2 +-
t/dist-pr109765.sh | 2 +-
t/dist-readonly.sh | 2 +-
t/dist-repeated.sh | 2 +-
t/dist-shar.sh | 2 +-
t/dist-tarZ.sh | 2 +-
t/dist-with-unreadable-makefile-fails.sh | 2 +-
t/distcheck-Tpo.sh | 2 +-
t/distcheck-configure-flags-am.sh | 2 +-
t/distcheck-configure-flags-subpkg.sh | 2 +-
t/distcheck-configure-flags.sh | 2 +-
t/distcheck-hook.sh | 2 +-
t/distcheck-hook2.sh | 2 +-
t/distcheck-missing-m4.sh | 2 +-
t/distcheck-no-prefix-or-srcdir-override.sh | 2 +-
t/distcheck-outdated-m4.sh | 2 +-
t/distcheck-override-infodir.sh | 2 +-
t/distcheck-pr10470.sh | 2 +-
t/distcheck-pr18286.sh | 2 +-
t/distcheck-pr9579.sh | 2 +-
t/distcheck-writable-srcdir.sh | 2 +-
t/distcleancheck.sh | 2 +-
t/distcom-subdir.sh | 2 +-
t/distcom2.sh | 2 +-
t/distcom3.sh | 2 +-
t/distcom4.sh | 2 +-
t/distcom5.sh | 2 +-
t/distdir.sh | 2 +-
t/disthook.sh | 2 +-
t/distlinks.sh | 2 +-
t/distlinksbrk.sh | 2 +-
t/distname.sh | 2 +-
t/dmalloc.sh | 2 +-
t/doc-parsing-buglets-colneq-subst.sh | 2 +-
t/doc-parsing-buglets-tabs.sh | 2 +-
t/dollar.sh | 2 +-
t/dollarvar.sh | 2 +-
t/dollarvar2.sh | 2 +-
t/double.sh | 2 +-
t/dup2.sh | 2 +-
t/else.sh | 2 +-
t/empty-data-primary.sh | 2 +-
t/empty-sources-primary.tap | 2 +-
t/exdir.sh | 2 +-
t/exdir2.sh | 2 +-
t/exdir3.sh | 2 +-
t/exeext.sh | 2 +-
t/exeext2.sh | 2 +-
t/exeext3.sh | 2 +-
t/exeext4.sh | 2 +-
t/ext.sh | 2 +-
t/ext2.sh | 2 +-
t/ext3.sh | 2 +-
t/extra-data.sh | 2 +-
t/extra-deps-lt.sh | 2 +-
t/extra-deps.sh | 2 +-
t/extra-dist-dirs-and-subdirs.sh | 2 +-
t/extra-dist-vpath-dir-merge.sh | 2 +-
t/extra-dist-vpath-dir.sh | 2 +-
t/extra-dist-wildcards-gnu.sh | 2 +-
t/extra-dist-wildcards-vpath.sh | 2 +-
t/extra-dist-wildcards.sh | 2 +-
t/extra-portability.sh | 2 +-
t/extra-portability2.sh | 2 +-
t/extra-portability3.sh | 2 +-
t/extra-programs-and-libs.sh | 2 +-
t/extra-programs-empty.sh | 2 +-
t/extra-programs-misc.sh | 2 +-
t/extra-sources-no-spurious.sh | 2 +-
t/extra-sources.sh | 2 +-
t/extra.sh | 2 +-
t/f90only.sh | 2 +-
t/flavor.sh | 2 +-
t/flibs.sh | 2 +-
t/fn99.sh | 2 +-
t/fn99subdir.sh | 2 +-
t/fnoc.sh | 2 +-
t/fonly.sh | 2 +-
t/forcemiss.sh | 2 +-
t/forcemiss2.sh | 2 +-
t/fort1.sh | 2 +-
t/fort2.sh | 2 +-
t/fort4.sh | 2 +-
t/fort5.sh | 2 +-
t/fortdep.sh | 2 +-
t/gcj.sh | 2 +-
t/gcj2.sh | 2 +-
t/gcj3.sh | 2 +-
t/gcj4.sh | 2 +-
t/gcj5.sh | 2 +-
t/gcj6.sh | 2 +-
t/get-sysconf.sh | 2 +-
t/gettext-basics.sh | 2 +-
t/gettext-config-rpath.sh | 2 +-
t/gettext-external-pr338.sh | 2 +-
t/gettext-intl-subdir.sh | 2 +-
t/gettext-macros.sh | 2 +-
t/gettext-pr381.sh | 2 +-
t/gnits.sh | 2 +-
t/gnits2.sh | 2 +-
t/gnits3.sh | 2 +-
t/gnumake.sh | 2 +-
t/gnuwarn.sh | 2 +-
t/gnuwarn2.sh | 2 +-
t/hdr-vars-defined-once.sh | 2 +-
t/header.sh | 2 +-
t/help-depend.sh | 2 +-
t/help-depend2.sh | 2 +-
t/help-dmalloc.sh | 2 +-
t/help-init.sh | 2 +-
t/help-lispdir.sh | 2 +-
t/help-python.sh | 2 +-
t/help-silent.sh | 2 +-
t/help-upc.sh | 2 +-
t/help.sh | 2 +-
t/help2.sh | 2 +-
t/help3.sh | 2 +-
t/help4.sh | 2 +-
t/hfs.sh | 2 +-
t/implicit.sh | 2 +-
t/includes-deprecation.sh | 2 +-
t/init.sh | 2 +-
t/init2.sh | 2 +-
t/install-info-dir.sh | 2 +-
t/install-sh-option-C.sh | 2 +-
t/install-sh-unittests.sh | 2 +-
t/installdir.sh | 2 +-
t/instdat.sh | 2 +-
t/instdat2.sh | 2 +-
t/instdir-cond.sh | 2 +-
t/instdir-cond2.sh | 2 +-
t/instdir-java.sh | 2 +-
t/instdir-lisp.sh | 2 +-
t/instdir-ltlib.sh | 2 +-
t/instdir-no-empty.sh | 2 +-
t/instdir-prog.sh | 2 +-
t/instdir-python.sh | 2 +-
t/instdir-texi.sh | 2 +-
t/instdir.sh | 2 +-
t/instdir2.sh | 2 +-
t/instexec.sh | 2 +-
t/instfail-info.sh | 2 +-
t/instfail-java.sh | 2 +-
t/instfail-libtool.sh | 2 +-
t/instfail.sh | 2 +-
t/insthook.sh | 2 +-
t/instman.sh | 2 +-
t/instman2.sh | 2 +-
t/instmany-mans.sh | 2 +-
t/instmany-python.sh | 2 +-
t/instmany.sh | 2 +-
t/instspc.tap | 2 +-
t/interp.sh | 2 +-
t/interp2.sh | 2 +-
t/java-check.sh | 2 +-
t/java-clean.sh | 2 +-
t/java-compile-install.sh | 2 +-
t/java-compile-run-flat.sh | 2 +-
t/java-compile-run-nested.sh | 2 +-
t/java-empty-classpath.sh | 2 +-
t/java-extra.sh | 2 +-
t/java-mix.sh | 2 +-
t/java-no-duplicate.sh | 2 +-
t/java-nobase.sh | 2 +-
t/java-noinst.sh | 2 +-
t/java-rebuild.sh | 2 +-
t/java-sources.sh | 2 +-
t/java-uninstall.sh | 2 +-
t/java.sh | 2 +-
t/java2.sh | 2 +-
t/java3.sh | 2 +-
t/javadir-undefined.sh | 2 +-
t/javaflags.sh | 2 +-
t/javaprim.sh | 2 +-
t/javasubst.sh | 2 +-
t/ldadd.sh | 2 +-
t/ldflags.sh | 2 +-
t/lex-clean-cxx.sh | 2 +-
t/lex-clean.sh | 2 +-
t/lex-depend-cxx.sh | 2 +-
t/lex-depend-grep.sh | 2 +-
t/lex-depend.sh | 2 +-
t/lex-header.sh | 2 +-
t/lex-lib-external.sh | 2 +-
t/lex-lib.sh | 2 +-
t/lex-libobj.sh | 2 +-
t/lex-line.sh | 2 +-
t/lex-multiple.sh | 2 +-
t/lex-nodist.sh | 2 +-
t/lex-noyywrap.sh | 2 +-
t/lex-pr204.sh | 2 +-
t/lex-subobj-nodep.sh | 2 +-
t/lex.sh | 2 +-
t/lex2.sh | 2 +-
t/lex3.sh | 2 +-
t/lex5.sh | 2 +-
t/lexcpp.sh | 2 +-
t/lexvpath.sh | 2 +-
t/lflags-cxx.sh | 2 +-
t/lflags.sh | 2 +-
t/libexec.sh | 2 +-
t/libobj-basic.sh | 2 +-
t/libobj10.sh | 2 +-
t/libobj12.sh | 2 +-
t/libobj13.sh | 2 +-
t/libobj14.sh | 2 +-
t/libobj15a.sh | 2 +-
t/libobj15b.sh | 2 +-
t/libobj15c.sh | 2 +-
t/libobj16a.sh | 2 +-
t/libobj16b.sh | 2 +-
t/libobj17.sh | 2 +-
t/libobj18.sh | 2 +-
t/libobj19.sh | 2 +-
t/libobj2.sh | 2 +-
t/libobj20b.sh | 2 +-
t/libobj20c.sh | 2 +-
t/libobj3.sh | 2 +-
t/libobj4.sh | 2 +-
t/libobj5.sh | 2 +-
t/libobj7.sh | 2 +-
t/library.sh | 2 +-
t/library2.sh | 2 +-
t/library3.sh | 2 +-
t/libtoo10.sh | 2 +-
t/libtoo11.sh | 2 +-
t/libtool-macros.sh | 2 +-
t/libtool.sh | 2 +-
t/libtool2.sh | 2 +-
t/libtool3.sh | 2 +-
t/libtool4.sh | 2 +-
t/libtool5.sh | 2 +-
t/libtool6.sh | 2 +-
t/libtool7.sh | 2 +-
t/libtool8.sh | 2 +-
t/libtool9.sh | 2 +-
t/license.sh | 2 +-
t/license2.sh | 2 +-
t/link_c_cxx.sh | 2 +-
t/link_cond.sh | 2 +-
t/link_dist.sh | 2 +-
t/link_f90_only.sh | 2 +-
t/link_f_only.sh | 2 +-
t/link_fc.sh | 2 +-
t/link_fccxx.sh | 2 +-
t/link_fcxx.sh | 2 +-
t/link_override.sh | 2 +-
t/lisp-flags.sh | 2 +-
t/lisp-loadpath.sh | 2 +-
t/lisp-pr11806.sh | 2 +-
t/lisp-subdir-mix.sh | 2 +-
t/lisp-subdir.sh | 2 +-
t/lisp-subdir2.sh | 2 +-
t/lisp2.sh | 2 +-
t/lisp3.sh | 2 +-
t/lisp4.sh | 2 +-
t/lisp5.sh | 2 +-
t/lisp6.sh | 2 +-
t/lisp7.sh | 2 +-
t/lisp8.sh | 2 +-
t/lispdry.sh | 2 +-
t/list-of-tests.mk | 2 +-
t/listval.sh | 2 +-
t/location.sh | 2 +-
t/longlin2.sh | 2 +-
t/longline.sh | 2 +-
t/ltcond.sh | 2 +-
t/ltcond2.sh | 2 +-
t/ltconv.sh | 2 +-
t/ltdeps.sh | 2 +-
t/ltinit.sh | 2 +-
t/ltinstloc.sh | 2 +-
t/ltlibobjs.sh | 2 +-
t/ltlibsrc.sh | 2 +-
t/ltorder.sh | 2 +-
t/m4-inclusion.sh | 2 +-
t/maintclean-vpath.sh | 2 +-
t/maintclean.sh | 2 +-
t/maintmode-configure-msg.sh | 2 +-
t/make-dryrun.tap | 2 +-
t/make-is-gnu.sh | 2 +-
t/make-keepgoing.tap | 2 +-
t/make.sh | 2 +-
t/makefile-deps.sh | 2 +-
t/makej.sh | 2 +-
t/makej2.sh | 2 +-
t/maken.sh | 2 +-
t/maken3.sh | 2 +-
t/makevars.sh | 2 +-
t/man.sh | 2 +-
t/man2.sh | 2 +-
t/man3.sh | 2 +-
t/man5.sh | 2 +-
t/man6.sh | 2 +-
t/man7.sh | 2 +-
t/man8.sh | 2 +-
t/mdate.sh | 2 +-
t/mdate2.sh | 2 +-
t/mdate3.sh | 2 +-
t/mdate4.sh | 2 +-
t/mdate5.sh | 2 +-
t/mdate6.sh | 2 +-
t/missing-auxfile-stops-makefiles-creation.sh | 2 +-
t/missing-version-mismatch.sh | 2 +-
t/missing3.sh | 2 +-
t/mkinst2.sh | 2 +-
t/mkinst3.sh | 2 +-
t/mkinstall.sh | 2 +-
t/mmode.sh | 2 +-
t/mmodely.sh | 2 +-
t/no-extra-c-stuff.sh | 2 +-
t/no-extra-makefile-code.sh | 2 +-
t/no-spurious-install-recursive.sh | 2 +-
t/nobase-libtool.sh | 2 +-
t/nobase-nodist.sh | 2 +-
t/nobase-python.sh | 2 +-
t/nobase.sh | 2 +-
t/nodef.sh | 2 +-
t/nodef2.sh | 2 +-
t/nodep.sh | 2 +-
t/nodep2.sh | 2 +-
t/nodepcomp.sh | 2 +-
t/nodist.sh | 2 +-
t/nodist2.sh | 2 +-
t/nodist3.sh | 2 +-
t/noinst.sh | 2 +-
t/noinstdir.sh | 2 +-
t/nolink.sh | 2 +-
t/nostdinc.sh | 2 +-
t/notrans.sh | 2 +-
t/number.sh | 2 +-
t/objc-basic.sh | 2 +-
t/objc-deps.sh | 2 +-
t/objc-flags.sh | 2 +-
t/objc-megademo.sh | 2 +-
t/objc-minidemo.sh | 2 +-
t/objcxx-basic.sh | 2 +-
t/objcxx-deps.sh | 2 +-
t/objcxx-flags.sh | 2 +-
t/objcxx-minidemo.sh | 2 +-
t/objext-pr10128.sh | 2 +-
t/oldvars.sh | 2 +-
t/order.sh | 2 +-
t/output-order.sh | 2 +-
t/output.sh | 2 +-
t/output10.sh | 2 +-
t/output11.sh | 2 +-
t/output12.sh | 2 +-
t/output13.sh | 2 +-
t/output2.sh | 2 +-
t/output3.sh | 2 +-
t/output4.sh | 2 +-
t/output5.sh | 2 +-
t/output6.sh | 2 +-
t/output7.sh | 2 +-
t/output8.sh | 2 +-
t/output9.sh | 2 +-
t/override-conditional-1.sh | 2 +-
t/override-conditional-2.sh | 2 +-
t/override-conditional-pr13940.sh | 2 +-
t/override-html.sh | 2 +-
t/override-suggest-local.sh | 2 +-
t/parallel-am.sh | 2 +-
t/parallel-am2.sh | 2 +-
t/parallel-am3.sh | 2 +-
t/parallel-tests-basics.sh | 2 +-
t/parallel-tests-cmdline-override.sh | 2 +-
t/parallel-tests-concurrency-2.sh | 2 +-
t/parallel-tests-concurrency.sh | 2 +-
t/parallel-tests-console-output.sh | 2 +-
t/parallel-tests-driver-install.sh | 2 +-
t/parallel-tests-dry-run-1.sh | 2 +-
t/parallel-tests-dry-run-2.sh | 2 +-
t/parallel-tests-empty-testlogs.sh | 2 +-
t/parallel-tests-empty.sh | 2 +-
t/parallel-tests-exeext.sh | 2 +-
t/parallel-tests-exit-status-reported.sh | 2 +-
t/parallel-tests-exit-statuses.sh | 2 +-
t/parallel-tests-extra-programs.sh | 2 +-
t/parallel-tests-fd-redirect-exeext.sh | 2 +-
t/parallel-tests-fd-redirect.sh | 2 +-
t/parallel-tests-fork-bomb.sh | 2 +-
t/parallel-tests-generated-and-distributed.sh | 2 +-
t/parallel-tests-harderror.sh | 2 +-
t/parallel-tests-interrupt.tap | 2 +-
t/parallel-tests-log-compiler-1.sh | 2 +-
t/parallel-tests-log-compiler-2.sh | 2 +-
t/parallel-tests-log-compiler-example.sh | 2 +-
t/parallel-tests-log-override-1.sh | 2 +-
t/parallel-tests-log-override-2.sh | 2 +-
t/parallel-tests-log-override-recheck.sh | 2 +-
t/parallel-tests-no-color-in-log.sh | 2 +-
t/parallel-tests-no-spurious-summary.sh | 2 +-
t/parallel-tests-once.sh | 2 +-
t/parallel-tests-recheck-depends-on-all.sh | 2 +-
t/parallel-tests-recheck-pr11791.sh | 2 +-
t/parallel-tests-recheck.sh | 2 +-
t/parallel-tests-reset-term.sh | 2 +-
t/parallel-tests-subdir.sh | 2 +-
t/parallel-tests-suffix-prog.sh | 2 +-
t/parallel-tests-suffix.sh | 2 +-
t/parallel-tests-trailing-whitespace.sh | 2 +-
t/parallel-tests-unreadable.sh | 2 +-
t/parse.sh | 2 +-
t/per-target-flags.sh | 2 +-
t/percent.sh | 2 +-
t/percent2.sh | 2 +-
t/perf/cond.sh | 2 +-
t/perf/testsuite-recheck.sh | 2 +-
t/perf/testsuite-summary.sh | 2 +-
t/phony.sh | 2 +-
t/pkg-config-macros.sh | 2 +-
t/pluseq.sh | 2 +-
t/pluseq10.sh | 2 +-
t/pluseq11.sh | 2 +-
t/pluseq2.sh | 2 +-
t/pluseq3.sh | 2 +-
t/pluseq4.sh | 2 +-
t/pluseq5.sh | 2 +-
t/pluseq6.sh | 2 +-
t/pluseq7.sh | 2 +-
t/pluseq8.sh | 2 +-
t/pluseq9.sh | 2 +-
t/pm/Cond2.pl | 2 +-
t/pm/Cond3.pl | 2 +-
t/pm/Condition-t.pl | 2 +-
t/pm/Condition.pl | 2 +-
t/pm/DisjCon2.pl | 2 +-
t/pm/DisjCon3.pl | 2 +-
t/pm/DisjConditions-t.pl | 2 +-
t/pm/DisjConditions.pl | 2 +-
t/pm/Version.pl | 2 +-
t/pm/Version2.pl | 2 +-
t/pm/Version3.pl | 2 +-
t/pm/Wrap.pl | 2 +-
t/posixsubst-data.sh | 2 +-
t/posixsubst-extradist.sh | 2 +-
t/posixsubst-ldadd.sh | 2 +-
t/posixsubst-libraries.sh | 2 +-
t/posixsubst-ltlibraries.sh | 2 +-
t/posixsubst-programs.sh | 2 +-
t/posixsubst-scripts.sh | 2 +-
t/posixsubst-sources.sh | 2 +-
t/posixsubst-tests.sh | 2 +-
t/ppf77.sh | 2 +-
t/pr2.sh | 2 +-
t/pr211.sh | 2 +-
t/pr220.sh | 2 +-
t/pr224.sh | 2 +-
t/pr229.sh | 2 +-
t/pr243.sh | 2 +-
t/pr266.sh | 2 +-
t/pr279-2.sh | 2 +-
t/pr279.sh | 2 +-
t/pr287.sh | 2 +-
t/pr300-lib.sh | 2 +-
t/pr300-ltlib.sh | 2 +-
t/pr300-prog.sh | 2 +-
t/pr307.sh | 2 +-
t/pr401.sh | 2 +-
t/pr401b.sh | 2 +-
t/pr401c.sh | 2 +-
t/pr72.sh | 2 +-
t/pr87.sh | 2 +-
t/pr9.sh | 2 +-
t/precious.sh | 2 +-
t/prefix.sh | 2 +-
t/preproc-basics.sh | 2 +-
t/preproc-c-compile.sh | 2 +-
t/preproc-demo.sh | 2 +-
t/preproc-errmsg.sh | 2 +-
t/primary-prefix-couples-documented-valid.sh | 2 +-
t/primary-prefix-couples-force-valid.sh | 2 +-
t/primary-prefix-invalid-couples.tap | 2 +-
t/primary-prefix-valid-couples.sh | 2 +-
t/primary.sh | 2 +-
t/primary2.sh | 2 +-
t/primary3.sh | 2 +-
t/print-libdir.sh | 2 +-
t/proginst.sh | 2 +-
t/programs-primary-rewritten.sh | 2 +-
t/py-compile-basedir.sh | 2 +-
t/py-compile-basic.sh | 2 +-
t/py-compile-destdir.sh | 2 +-
t/py-compile-env.sh | 2 +-
t/py-compile-option-terminate.sh | 2 +-
t/py-compile-usage.sh | 2 +-
t/python-am-path-iftrue.sh | 2 +-
t/python-dist.sh | 2 +-
t/python-missing.sh | 2 +-
t/python-pr10995.sh | 2 +-
t/python-too-old.sh | 2 +-
t/python-vars.sh | 2 +-
t/python-virtualenv.sh | 2 +-
t/python.sh | 2 +-
t/python10.sh | 2 +-
t/python11.sh | 2 +-
t/python12.sh | 2 +-
t/python2.sh | 2 +-
t/python3.sh | 2 +-
t/recurs-user-deeply-nested.sh | 2 +-
t/recurs-user-indir.sh | 2 +-
t/recurs-user-keep-going.sh | 2 +-
t/recurs-user-many.sh | 2 +-
t/recurs-user-no-subdirs.sh | 2 +-
t/recurs-user-no-top-level.sh | 2 +-
t/recurs-user-override.sh | 2 +-
t/recurs-user-phony.sh | 2 +-
t/recurs-user-wrap.sh | 2 +-
t/recurs-user.sh | 2 +-
t/recurs-user2.sh | 2 +-
t/relativize.tap | 2 +-
t/remake-aclocal-version-mismatch.sh | 2 +-
t/remake-after-acinclude-m4.sh | 2 +-
t/remake-after-aclocal-m4.sh | 2 +-
t/remake-after-configure-ac.sh | 2 +-
t/remake-after-makefile-am.sh | 2 +-
t/remake-all-1.sh | 2 +-
t/remake-all-2.sh | 2 +-
t/remake-am-pr10111.sh | 2 +-
t/remake-config-status-dependencies.sh | 2 +-
t/remake-configure-dependencies.sh | 2 +-
t/remake-deeply-nested.sh | 2 +-
t/remake-deleted-am-2.sh | 2 +-
t/remake-deleted-am-subdir.sh | 2 +-
t/remake-deleted-am.sh | 2 +-
t/remake-deleted-m4-file.sh | 2 +-
t/remake-fail.sh | 2 +-
t/remake-gnulib-add-acsubst.sh | 2 +-
t/remake-gnulib-add-header.sh | 2 +-
t/remake-gnulib-remove-header.sh | 2 +-
t/remake-include-aclocal.sh | 2 +-
t/remake-include-configure.sh | 2 +-
t/remake-include-makefile.sh | 2 +-
t/remake-m4-pr10111.sh | 2 +-
t/remake-macrodir.sh | 2 +-
t/remake-maintainer-mode.sh | 2 +-
t/remake-makefile-intree.sh | 2 +-
t/remake-makefile-vpath.sh | 2 +-
t/remake-mild-stress.sh | 2 +-
t/remake-moved-m4-file.sh | 2 +-
t/remake-not-after-make-dist.sh | 2 +-
t/remake-recurs-user.sh | 2 +-
t/remake-renamed-am.sh | 2 +-
t/remake-renamed-m4-file.sh | 2 +-
t/remake-renamed-m4-macro-and-file.sh | 2 +-
t/remake-renamed-m4-macro.sh | 2 +-
t/remake-subdir-from-subdir.sh | 2 +-
t/remake-subdir-gnu.sh | 2 +-
t/remake-subdir-grepping.sh | 2 +-
t/remake-subdir-long-time.sh | 2 +-
t/remake-subdir-no-makefile.sh | 2 +-
t/remake-subdir-only.sh | 2 +-
t/remake-subdir.sh | 2 +-
t/remake-subdir2.sh | 2 +-
t/remake-subdir3.sh | 2 +-
t/remake-timing-bug-pr8365.sh | 2 +-
t/repeated-options.sh | 2 +-
t/reqd2.sh | 2 +-
t/rm-f-probe.sh | 2 +-
t/rulepat.sh | 2 +-
t/sanity.sh | 2 +-
t/seenc.sh | 2 +-
t/self-check-cc-no-c-o.sh | 2 +-
t/self-check-configure-help.sh | 2 +-
t/self-check-dir.tap | 2 +-
t/self-check-exit.tap | 2 +-
t/self-check-explicit-skips.sh | 2 +-
t/self-check-is-blocked-signal.tap | 2 +-
t/self-check-is_newest.tap | 2 +-
t/self-check-me.tap | 2 +-
t/self-check-report.sh | 2 +-
t/self-check-seq.tap | 2 +-
t/self-check-shell-no-trail-bslash.sh | 2 +-
t/self-check-unindent.tap | 2 +-
t/serial-tests.sh | 2 +-
t/silent-c.sh | 2 +-
t/silent-configsite.sh | 2 +-
t/silent-custom.sh | 2 +-
t/silent-cxx.sh | 2 +-
t/silent-f77.sh | 2 +-
t/silent-f90.sh | 2 +-
t/silent-gen.sh | 2 +-
t/silent-lex.sh | 2 +-
t/silent-lt.sh | 2 +-
t/silent-many-languages.sh | 2 +-
t/silent-nested-vars.sh | 2 +-
t/silent-texi.sh | 2 +-
t/silent-yacc-headers.sh | 2 +-
t/silent-yacc.sh | 2 +-
t/space.sh | 2 +-
t/specflg-dummy.sh | 2 +-
t/specflg6.sh | 2 +-
t/specflg7.sh | 2 +-
t/specflg8.sh | 2 +-
t/specflg9.sh | 2 +-
t/spell.sh | 2 +-
t/spell2.sh | 2 +-
t/spell3.sh | 2 +-
t/spelling.sh | 2 +-
t/spy-double-colon.sh | 2 +-
t/spy-rm.tap | 2 +-
t/src-acsubst.sh | 2 +-
t/stamph2.sh | 2 +-
t/stdinc.sh | 2 +-
t/stdlib.sh | 2 +-
t/stdlib2.sh | 2 +-
t/strictness-override.sh | 2 +-
t/strictness-precedence.sh | 2 +-
t/strip.sh | 2 +-
t/strip2.sh | 2 +-
t/strip3.sh | 2 +-
t/subdir-ac-subst.sh | 2 +-
t/subdir-add-pr46.sh | 2 +-
t/subdir-add2-pr46.sh | 2 +-
t/subdir-am-cond.sh | 2 +-
t/subdir-cond-err.sh | 2 +-
t/subdir-cond-gettext.sh | 2 +-
t/subdir-distclean.sh | 2 +-
t/subdir-env-interference.sh | 2 +-
t/subdir-keep-going-pr12554.sh | 2 +-
t/subdir-order.sh | 2 +-
t/subdir-subsub.sh | 2 +-
t/subdir-with-slash.sh | 2 +-
t/subdir.sh | 2 +-
t/subobj-clean-lt-pr10697.sh | 2 +-
t/subobj-clean-pr10697.sh | 2 +-
t/subobj-indir-pr13928.sh | 2 +-
t/subobj-pr13928-more-langs.sh | 2 +-
t/subobj-vpath-pr13928.sh | 2 +-
t/subobj.sh | 2 +-
t/subobj10.sh | 2 +-
t/subobj11a.sh | 2 +-
t/subobj11b.sh | 2 +-
t/subobj11c.sh | 2 +-
t/subobj2.sh | 2 +-
t/subobj5.sh | 2 +-
t/subobj6.sh | 2 +-
t/subobj7.sh | 2 +-
t/subobj8.sh | 2 +-
t/subobj9.sh | 2 +-
t/subobjname.sh | 2 +-
t/subpkg-macrodir.sh | 2 +-
t/subpkg-yacc.sh | 2 +-
t/subpkg.sh | 2 +-
t/subpkg2.sh | 2 +-
t/subpkg3.sh | 2 +-
t/subpkg4.sh | 2 +-
t/subst-no-trailing-empty-line.sh | 2 +-
t/subst.sh | 2 +-
t/subst3.sh | 2 +-
t/subst4.sh | 2 +-
t/subst5.sh | 2 +-
t/substre2.sh | 2 +-
t/substref.sh | 2 +-
t/substtarg.sh | 2 +-
t/suffix-chain.tap | 2 +-
t/suffix-custom-pr14441.sh | 2 +-
t/suffix-custom-subobj-and-specflg.sh | 2 +-
t/suffix-custom-subobj.sh | 2 +-
t/suffix-extra-c-stuff-pr14560.sh | 2 +-
t/suffix.sh | 2 +-
t/suffix10.tap | 2 +-
t/suffix11.tap | 2 +-
t/suffix2.sh | 2 +-
t/suffix3.tap | 2 +-
t/suffix4.sh | 2 +-
t/suffix5.sh | 2 +-
t/suffix6.sh | 2 +-
t/suffix6b.sh | 2 +-
t/suffix6c.sh | 2 +-
t/suffix7.sh | 2 +-
t/suffix8.tap | 2 +-
t/suffix9.sh | 2 +-
t/symlink.sh | 2 +-
t/symlink2.sh | 2 +-
t/syntax.sh | 2 +-
t/tags-pr12372.sh | 2 +-
t/tags.sh | 2 +-
t/tags2.sh | 2 +-
t/tagsub.sh | 2 +-
t/tap-ambiguous-directive.sh | 2 +-
t/tap-autonumber.sh | 2 +-
t/tap-bad-prog.tap | 2 +-
t/tap-bailout-and-logging.sh | 2 +-
t/tap-bailout-leading-space.sh | 2 +-
t/tap-bailout-suppress-badexit.sh | 2 +-
t/tap-bailout-suppress-later-diagnostic.sh | 2 +-
t/tap-bailout-suppress-later-errors.sh | 2 +-
t/tap-bailout.sh | 2 +-
t/tap-basic.sh | 2 +-
t/tap-color.sh | 2 +-
t/tap-common-setup.sh | 2 +-
t/tap-deps.sh | 2 +-
t/tap-diagnostic-custom.sh | 2 +-
t/tap-diagnostic.sh | 2 +-
t/tap-doc.sh | 2 +-
t/tap-doc2.sh | 2 +-
t/tap-driver-stderr.sh | 2 +-
t/tap-empty-diagnostic.sh | 2 +-
t/tap-empty.sh | 2 +-
t/tap-escape-directive-2.sh | 2 +-
t/tap-escape-directive.sh | 2 +-
t/tap-exit.sh | 2 +-
t/tap-fancy.sh | 2 +-
t/tap-fancy2.sh | 2 +-
t/tap-global-log.sh | 2 +-
t/tap-global-result.sh | 2 +-
t/tap-log.sh | 2 +-
t/tap-merge-stdout-stderr.sh | 2 +-
t/tap-missing-plan-and-bad-exit.sh | 2 +-
t/tap-more.sh | 2 +-
t/tap-more2.sh | 2 +-
t/tap-msg0-bailout.sh | 2 +-
t/tap-msg0-directive.sh | 2 +-
t/tap-msg0-misc.sh | 2 +-
t/tap-msg0-planskip.sh | 2 +-
t/tap-msg0-result.sh | 2 +-
t/tap-negative-numbers.sh | 2 +-
t/tap-no-disable-hard-error.sh | 2 +-
t/tap-no-merge-stdout-stderr.sh | 2 +-
t/tap-no-spurious-numbers.sh | 2 +-
t/tap-no-spurious-summary.sh | 2 +-
t/tap-no-spurious.sh | 2 +-
t/tap-not-ok-skip.sh | 2 +-
t/tap-number-wordboundary.sh | 2 +-
t/tap-numbers-leading-zero.sh | 2 +-
t/tap-numeric-description.sh | 2 +-
t/tap-out-of-order.sh | 2 +-
t/tap-passthrough-exit.sh | 2 +-
t/tap-passthrough.sh | 2 +-
t/tap-plan-corner.sh | 2 +-
t/tap-plan-errors.sh | 2 +-
t/tap-plan-leading-zero.sh | 2 +-
t/tap-plan-malformed.sh | 2 +-
t/tap-plan-middle.sh | 2 +-
t/tap-plan-whitespace.sh | 2 +-
t/tap-plan.sh | 2 +-
t/tap-planskip-and-logging.sh | 2 +-
t/tap-planskip-badexit.sh | 2 +-
t/tap-planskip-bailout.sh | 2 +-
t/tap-planskip-case-insensitive.sh | 2 +-
t/tap-planskip-late.sh | 2 +-
t/tap-planskip-later-errors.sh | 2 +-
t/tap-planskip-unplanned-corner.sh | 2 +-
t/tap-planskip-unplanned.sh | 2 +-
t/tap-planskip-whitespace.sh | 2 +-
t/tap-planskip.sh | 2 +-
t/tap-recheck-logs.sh | 2 +-
t/tap-recheck.sh | 2 +-
t/tap-result-comment.sh | 2 +-
t/tap-signal.tap | 2 +-
t/tap-summary-color.sh | 2 +-
t/tap-summary.sh | 2 +-
t/tap-test-number-0.sh | 2 +-
t/tap-todo-skip-together.sh | 2 +-
t/tap-todo-skip-whitespace.sh | 2 +-
t/tap-todo-skip.sh | 2 +-
t/tap-unplanned.sh | 2 +-
t/tap-whitespace-normalization.sh | 2 +-
t/tap-with-and-without-number.sh | 2 +-
t/tap-xfail-tests.sh | 2 +-
t/tar-opts-errors.sh | 2 +-
t/tar-override.sh | 2 +-
t/tar-pax.sh | 2 +-
t/tar-ustar-id-too-high.sh | 2 +-
t/tar-ustar.sh | 2 +-
t/target-cflags.sh | 2 +-
t/targetclash.sh | 2 +-
t/test-driver-acsubst.sh | 2 +-
t/test-driver-cond.sh | 2 +-
t/test-driver-create-log-dir.sh | 2 +-
t/test-driver-custom-multitest-recheck.sh | 2 +-
t/test-driver-custom-multitest-recheck2.sh | 2 +-
t/test-driver-custom-multitest.sh | 2 +-
t/test-driver-custom-no-extra-driver.sh | 2 +-
t/test-driver-custom-xfail-tests.sh | 2 +-
t/test-driver-custom.sh | 2 +-
t/test-driver-fail.sh | 2 +-
t/test-driver-is-distributed.sh | 2 +-
t/test-driver-strip-vpath.sh | 2 +-
t/test-driver-trs-suffix-registered.sh | 2 +-
t/test-extensions-cond.sh | 2 +-
t/test-extensions.sh | 2 +-
t/test-harness-vpath-rewrite.sh | 2 +-
t/test-log.sh | 2 +-
t/test-logs-repeated.sh | 2 +-
t/test-metadata-global-log.sh | 2 +-
t/test-metadata-global-result.sh | 2 +-
t/test-metadata-recheck.sh | 2 +-
t/test-metadata-results.sh | 2 +-
t/test-missing.sh | 2 +-
t/test-missing2.sh | 2 +-
t/test-trs-basic.sh | 2 +-
t/test-trs-recover.sh | 2 +-
t/test-trs-recover2.sh | 2 +-
t/tests-environment-and-log-compiler.sh | 2 +-
t/tests-environment-backcompat.sh | 2 +-
t/tests-environment-fd-redirect.sh | 2 +-
t/tests-environment.sh | 2 +-
t/testsuite-summary-color.sh | 2 +-
t/testsuite-summary-count-many.sh | 2 +-
t/testsuite-summary-count.sh | 2 +-
t/testsuite-summary-reference-log.sh | 2 +-
t/transform.sh | 2 +-
t/transform2.sh | 2 +-
t/transform3.sh | 2 +-
t/txinfo-absolute-srcdir-pr408.sh | 2 +-
t/txinfo-add-missing-and-dist.sh | 2 +-
t/txinfo-bsd-make-recurs.sh | 2 +-
t/txinfo-builddir.sh | 2 +-
t/txinfo-clean.sh | 2 +-
t/txinfo-dvi-recurs.sh | 2 +-
t/txinfo-include.sh | 2 +-
t/txinfo-info-in-srcdir.sh | 2 +-
t/txinfo-makeinfo-error-no-clobber.sh | 2 +-
t/txinfo-many-output-formats-vpath.sh | 2 +-
t/txinfo-many-output-formats.sh | 2 +-
t/txinfo-no-clutter.sh | 2 +-
t/txinfo-no-extra-dist.sh | 2 +-
t/txinfo-no-installinfo.sh | 2 +-
t/txinfo-no-repeated-targets.sh | 2 +-
t/txinfo-no-split.sh | 2 +-
t/txinfo-nodist-info.sh | 2 +-
t/txinfo-other-suffixes.sh | 2 +-
t/txinfo-override-infodeps.sh | 2 +-
t/txinfo-override-texinfo-tex.sh | 2 +-
t/txinfo-setfilename-repeated.sh | 2 +-
t/txinfo-setfilename-suffix-strip.sh | 2 +-
t/txinfo-subdir-pr343.sh | 2 +-
t/txinfo-tex-dist.sh | 2 +-
t/txinfo-unrecognized-extension.sh | 2 +-
t/txinfo-unrecognized-info-suffix.sh | 2 +-
t/txinfo-vtexi.sh | 2 +-
t/txinfo-vtexi2.sh | 2 +-
t/txinfo-vtexi3.sh | 2 +-
t/txinfo-vtexi4.sh | 2 +-
t/txinfo-without-info-suffix.sh | 2 +-
t/uninstall-fail.sh | 2 +-
t/uninstall-pr9578.sh | 2 +-
t/unused.sh | 2 +-
t/upc.sh | 2 +-
t/upc2.sh | 2 +-
t/upc3.sh | 2 +-
t/vala-configure.sh | 2 +-
t/vala-grepping.sh | 2 +-
t/vala-headers.sh | 2 +-
t/vala-libs.sh | 2 +-
t/vala-mix.sh | 2 +-
t/vala-mix2.sh | 2 +-
t/vala-non-recursive-setup.sh | 2 +-
t/vala-parallel.sh | 2 +-
t/vala-per-target-flags.sh | 2 +-
t/vala-recursive-setup.sh | 2 +-
t/vala-vapi.sh | 2 +-
t/vala-vpath.sh | 2 +-
t/var-recurs.sh | 2 +-
t/var-recurs2.sh | 2 +-
t/vars.sh | 2 +-
t/vars3.sh | 2 +-
t/vartar.sh | 2 +-
t/vartypo2.sh | 2 +-
t/vartypos.sh | 2 +-
t/version3.sh | 2 +-
t/version4.sh | 2 +-
t/version6.sh | 2 +-
t/version7.sh | 2 +-
t/version8.sh | 2 +-
t/vpath.sh | 2 +-
t/warning-groups-win-over-strictness.sh | 2 +-
t/warnings-obsolete-default.sh | 2 +-
t/warnings-override.sh | 2 +-
t/warnings-precedence.sh | 2 +-
t/warnings-strictness-interactions.sh | 2 +-
t/warnings-unknown.sh | 2 +-
t/warnings-win-over-strictness.sh | 2 +-
t/warnopts.sh | 2 +-
t/werror.sh | 2 +-
t/werror2.sh | 2 +-
t/werror3.sh | 2 +-
t/werror4.sh | 2 +-
t/whoami.sh | 2 +-
t/wrap/aclocal.in | 2 +-
t/wrap/automake.in | 2 +-
t/xsource.sh | 2 +-
t/yacc-auxdir.sh | 2 +-
t/yacc-basic.sh | 2 +-
t/yacc-bison-skeleton-cxx.sh | 2 +-
t/yacc-bison-skeleton.sh | 2 +-
t/yacc-clean-cxx.sh | 2 +-
t/yacc-clean.sh | 2 +-
t/yacc-cxx-grepping.sh | 2 +-
t/yacc-cxx.sh | 2 +-
t/yacc-d-basic.sh | 2 +-
t/yacc-d-cxx.sh | 2 +-
t/yacc-d-vpath.sh | 2 +-
t/yacc-deleted-headers.sh | 2 +-
t/yacc-depend.sh | 2 +-
t/yacc-depend2.sh | 2 +-
t/yacc-dist-nobuild-subdir.sh | 2 +-
t/yacc-dist-nobuild.sh | 2 +-
t/yacc-dry.sh | 2 +-
t/yacc-grepping.sh | 2 +-
t/yacc-grepping2.sh | 2 +-
t/yacc-headers-and-dist-pr47.sh | 2 +-
t/yacc-line.sh | 2 +-
t/yacc-misc.sh | 2 +-
t/yacc-mix-c-cxx.sh | 2 +-
t/yacc-nodist.sh | 2 +-
t/yacc-pr204.sh | 2 +-
t/yacc-subdir.sh | 2 +-
t/yacc-vpath.sh | 2 +-
t/yacc-weirdnames.sh | 2 +-
t/yflags-cmdline-override.sh | 2 +-
t/yflags-conditional.sh | 2 +-
t/yflags-cxx.sh | 2 +-
t/yflags-d-false-positives.sh | 2 +-
t/yflags-force-conditional.sh | 2 +-
t/yflags-force-override.sh | 2 +-
t/yflags-var-expand.sh | 2 +-
t/yflags.sh | 2 +-
1440 files changed, 1440 insertions(+), 1445 deletions(-)
diff --git a/COPYING b/COPYING
index d511905c1..73e818e98 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ Copyright (C) 1989-2017 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff --git a/GNUmakefile b/GNUmakefile
index 9694dc8be..ebc38764c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,6 +1,6 @@
# Maintainer makefile for Automake. Requires GNU make.
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/HACKING b/HACKING
index 1ced6b2cd..6ffc9ca15 100644
--- a/HACKING
+++ b/HACKING
@@ -384,7 +384,7 @@
-----
-Copyright (C) 2003-2015 Free Software Foundation, Inc.
+Copyright (C) 2003-2017 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
diff --git a/INSTALL b/INSTALL
index 4cbd15f99..422dd3a1c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,7 @@
Installation Instructions
*************************
-Copyright (C) 1994-1996, 1999-2002, 2004-2014 Free Software Foundation,
-Inc.
+Copyright (C) 1994-2017 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
diff --git a/Makefile.am b/Makefile.am
index 5fb94e606..529a0cf74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
## Makefile for Automake.
-# Copyright (C) 1995-2015 Free Software Foundation, Inc.
+# Copyright (C) 1995-2017 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
diff --git a/NEWS b/NEWS
index 039820387..f1d214311 100644
--- a/NEWS
+++ b/NEWS
@@ -3046,7 +3046,7 @@ New in 0.20:
-----
-Copyright (C) 1995-2015 Free Software Foundation, Inc.
+Copyright (C) 1995-2017 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
diff --git a/README b/README
index fdf25fa0c..fc14a7c3e 100644
--- a/README
+++ b/README
@@ -52,7 +52,7 @@ that the range specifies every single year in that closed interval.
-----
-Copyright (C) 1994-2012 Free Software Foundation, Inc.
+Copyright (C) 1994-2017 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
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 8ec005643..102dec9fc 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -1,4 +1,4 @@
-## Copyright (C) 1995-2015 Free Software Foundation, Inc.
+## Copyright (C) 1995-2017 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
diff --git a/bin/aclocal.in b/bin/aclocal.in
index 224f8c736..e90bef9fb 100644
--- a/bin/aclocal.in
+++ b/bin/aclocal.in
@@ -7,7 +7,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
# aclocal - create aclocal.m4 by scanning configure.ac
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/bin/automake.in b/bin/automake.in
index 3abee49d2..74990b364 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -6,7 +6,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
if 0;
# automake - create Makefile.in from Makefile.am
-# Copyright (C) 1994-2015 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 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
diff --git a/bin/gen-perl-protos b/bin/gen-perl-protos
index d78fe8a97..215d275b8 100755
--- a/bin/gen-perl-protos
+++ b/bin/gen-perl-protos
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
#
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/bootstrap.sh b/bootstrap.sh
index 87719ba73..3b11cd869 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -2,7 +2,7 @@
# This script helps bootstrap automake, when checked out from git.
#
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
# Originally written by Pavel Roskin September 2002.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/configure.ac b/configure.ac
index 9e34f95f5..fce725489 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
-# Copyright (C) 1995-2015 Free Software Foundation, Inc.
+# Copyright (C) 1995-2017 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
diff --git a/contrib/check-html.am b/contrib/check-html.am
index 36cace419..fc5db41ae 100644
--- a/contrib/check-html.am
+++ b/contrib/check-html.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2015 Free Software Foundation, Inc.
+## Copyright (C) 2001-2017 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
diff --git a/contrib/multilib/config-ml.in b/contrib/multilib/config-ml.in
index 2956217e3..cc7f79756 100644
--- a/contrib/multilib/config-ml.in
+++ b/contrib/multilib/config-ml.in
@@ -1,7 +1,7 @@
# Configure fragment invoked in the post-target section for subdirs
# wanting multilib support.
#
-# Copyright (C) 1995-2015 Free Software Foundation, Inc.
+# Copyright (C) 1995-2017 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/contrib/multilib/multi.m4 b/contrib/multilib/multi.m4
index 39b05c10b..2156e6691 100644
--- a/contrib/multilib/multi.m4
+++ b/contrib/multilib/multi.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/contrib/multilib/multilib.am b/contrib/multilib/multilib.am
index 1781295be..5c98b69bd 100644
--- a/contrib/multilib/multilib.am
+++ b/contrib/multilib/multilib.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 Free Software Foundation, Inc.
## This Makefile.in is free software; the Free Software Foundation
## gives unlimited permission to copy and/or distribute it,
## with or without modifications, as long as this notice is preserved.
diff --git a/contrib/multilib/symlink-tree b/contrib/multilib/symlink-tree
index 0529b997a..49de9fc54 100755
--- a/contrib/multilib/symlink-tree
+++ b/contrib/multilib/symlink-tree
@@ -1,7 +1,7 @@
#!/bin/sh
# Create a symlink tree.
#
-# Copyright (C) 1995-2015 Free Software Foundation, Inc.
+# Copyright (C) 1995-2017 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/contrib/t/Makefile.inc b/contrib/t/Makefile.inc
index 51d577941..d55fb9583 100644
--- a/contrib/t/Makefile.inc
+++ b/contrib/t/Makefile.inc
@@ -1,6 +1,6 @@
## Included by top-level Makefile for Automake.
-## Copyright (C) 1995-2015 Free Software Foundation, Inc.
+## Copyright (C) 1995-2017 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
diff --git a/contrib/t/help-multilib.sh b/contrib/t/help-multilib.sh
index 6e0ab2729..b58ca80d1 100755
--- a/contrib/t/help-multilib.sh
+++ b/contrib/t/help-multilib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/contrib/t/multilib.sh b/contrib/t/multilib.sh
index 5a77f0aa2..3899ce449 100755
--- a/contrib/t/multilib.sh
+++ b/contrib/t/multilib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/contrib/t/parallel-tests-html-recursive.sh b/contrib/t/parallel-tests-html-recursive.sh
index 4a7c04cd5..f2d1fba08 100755
--- a/contrib/t/parallel-tests-html-recursive.sh
+++ b/contrib/t/parallel-tests-html-recursive.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/contrib/t/parallel-tests-html.sh b/contrib/t/parallel-tests-html.sh
index eca818da2..4d2f8e34e 100755
--- a/contrib/t/parallel-tests-html.sh
+++ b/contrib/t/parallel-tests-html.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/contrib/tap-driver.pl b/contrib/tap-driver.pl
index e9caa8e63..637c14c3c 100755
--- a/contrib/tap-driver.pl
+++ b/contrib/tap-driver.pl
@@ -1,5 +1,5 @@
#! /usr/bin/env perl
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/doc/Makefile.inc b/doc/Makefile.inc
index 1df3bc67d..b39ce89c7 100644
--- a/doc/Makefile.inc
+++ b/doc/Makefile.inc
@@ -1,6 +1,6 @@
## Included by top-level Makefile for Automake.
-## Copyright (C) 1995-2015 Free Software Foundation, Inc.
+## Copyright (C) 1995-2017 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
diff --git a/doc/amhello/Makefile.am b/doc/amhello/Makefile.am
index c5dda9438..706c2f298 100644
--- a/doc/amhello/Makefile.am
+++ b/doc/amhello/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
# This Makefile.am is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
diff --git a/doc/amhello/configure.ac b/doc/amhello/configure.ac
index 9b0901726..381344d7a 100644
--- a/doc/amhello/configure.ac
+++ b/doc/amhello/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
# This configure.ac script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
diff --git a/doc/amhello/src/Makefile.am b/doc/amhello/src/Makefile.am
index 5e0b64a8a..e52ff3c3b 100644
--- a/doc/amhello/src/Makefile.am
+++ b/doc/amhello/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
# This Makefile.am is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
diff --git a/doc/amhello/src/main.c b/doc/amhello/src/main.c
index d2cb7cc0f..7a7ebec77 100644
--- a/doc/amhello/src/main.c
+++ b/doc/amhello/src/main.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2017 Free Software Foundation, Inc.
This program is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it. */
diff --git a/doc/automake-history.texi b/doc/automake-history.texi
index 57355544a..75141f97a 100644
--- a/doc/automake-history.texi
+++ b/doc/automake-history.texi
@@ -10,7 +10,7 @@
This manual describes (part of) the history of GNU Automake, a program
that creates GNU standards-compliant Makefiles from template files.
-Copyright @copyright{} 1995-2015 Free Software Foundation, Inc.
+Copyright @copyright{} 1995-2017 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/automake.texi b/doc/automake.texi
index ecfbbc836..01dc65972 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -25,7 +25,7 @@ This manual is for GNU Automake (version @value{VERSION},
@value{UPDATED}), a program that creates GNU standards-compliant
Makefiles from template files.
-Copyright @copyright{} 1995-2015 Free Software Foundation, Inc.
+Copyright @copyright{} 1995-2017 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/fdl.texi b/doc/fdl.texi
index c164771fd..16589f90b 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -5,7 +5,7 @@
@c hence no sectioning command or @node.
@display
-Copyright @copyright{} 2000-2015 Free Software Foundation, Inc.
+Copyright @copyright{} 2000-2017 Free Software Foundation, Inc.
@uref{http://fsf.org/}
Everyone is permitted to copy and distribute verbatim copies
diff --git a/doc/help2man b/doc/help2man
index 9173df331..e651b8d2d 100755
--- a/doc/help2man
+++ b/doc/help2man
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
# Generate a short man page from --help and --version output.
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/gen-testsuite-part b/gen-testsuite-part
index 957351b11..53b5f399b 100755
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -3,7 +3,7 @@
# of the Automake testsuite. Also, automatically generate some more
# tests from them (for particular cases/setups only).
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index bc53eae69..145ff47f0 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index 558532e14..a98fb51b0 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm
index ec96d0b07..7955f36ab 100644
--- a/lib/Automake/Condition.pm
+++ b/lib/Automake/Condition.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index 6661d0342..9437eca9d 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -1,5 +1,5 @@
# -*- Perl -*-
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
# @configure_input@
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index 6281e96db..2f43391c8 100644
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index b9d871173..1a4fbc73e 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/lib/Automake/General.pm b/lib/Automake/General.pm
index 8ae3201d1..e0e4c60d8 100644
--- a/lib/Automake/General.pm
+++ b/lib/Automake/General.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/lib/Automake/Getopt.pm b/lib/Automake/Getopt.pm
index 938d1564f..0f4d85373 100644
--- a/lib/Automake/Getopt.pm
+++ b/lib/Automake/Getopt.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/lib/Automake/Item.pm b/lib/Automake/Item.pm
index e3471b19a..f220479ed 100644
--- a/lib/Automake/Item.pm
+++ b/lib/Automake/Item.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/lib/Automake/ItemDef.pm b/lib/Automake/ItemDef.pm
index ed62094a4..b6d2655c1 100644
--- a/lib/Automake/ItemDef.pm
+++ b/lib/Automake/ItemDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/lib/Automake/Language.pm b/lib/Automake/Language.pm
index 289e310c5..bd1a555dc 100644
--- a/lib/Automake/Language.pm
+++ b/lib/Automake/Language.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/lib/Automake/Location.pm b/lib/Automake/Location.pm
index 945d90ebd..9aa69ded3 100644
--- a/lib/Automake/Location.pm
+++ b/lib/Automake/Location.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/lib/Automake/Makefile.inc b/lib/Automake/Makefile.inc
index 2e5722e70..6763f403f 100644
--- a/lib/Automake/Makefile.inc
+++ b/lib/Automake/Makefile.inc
@@ -1,6 +1,6 @@
## Included by top-level Makefile for Automake.
-## Copyright (C) 1995-2015 Free Software Foundation, Inc.
+## Copyright (C) 1995-2017 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
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index d7eeebf08..7c215a249 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 100408cd6..58b2d4b20 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/lib/Automake/RuleDef.pm b/lib/Automake/RuleDef.pm
index b90060e40..b8a6bda7a 100644
--- a/lib/Automake/RuleDef.pm
+++ b/lib/Automake/RuleDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/lib/Automake/VarDef.pm b/lib/Automake/VarDef.pm
index dc6558e6e..1948ef123 100644
--- a/lib/Automake/VarDef.pm
+++ b/lib/Automake/VarDef.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index bbd74c88b..3e5035824 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/lib/Automake/Version.pm b/lib/Automake/Version.pm
index fef9da97b..282af77de 100644
--- a/lib/Automake/Version.pm
+++ b/lib/Automake/Version.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
index 8bfd8d1cf..908b06e4b 100644
--- a/lib/Automake/Wrap.pm
+++ b/lib/Automake/Wrap.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index 2bc772150..a71fba8fb 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/lib/COPYING b/lib/COPYING
index 94a9ed024..2c343867e 100644
--- a/lib/COPYING
+++ b/lib/COPYING
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007-2017 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff --git a/lib/INSTALL b/lib/INSTALL
index 4cbd15f99..422dd3a1c 100644
--- a/lib/INSTALL
+++ b/lib/INSTALL
@@ -1,8 +1,7 @@
Installation Instructions
*************************
-Copyright (C) 1994-1996, 1999-2002, 2004-2014 Free Software Foundation,
-Inc.
+Copyright (C) 1994-2017 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index c0a20cb2e..50035de60 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -1,6 +1,6 @@
## Included by top-level Makefile for Automake.
-## Copyright (C) 1995-2015 Free Software Foundation, Inc.
+## Copyright (C) 1995-2017 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
diff --git a/lib/am/Makefile.inc b/lib/am/Makefile.inc
index 923c86159..270bb7347 100644
--- a/lib/am/Makefile.inc
+++ b/lib/am/Makefile.inc
@@ -1,6 +1,6 @@
## Included by top-level Makefile for Automake.
-## Copyright (C) 1995-2015 Free Software Foundation, Inc.
+## Copyright (C) 1995-2017 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
diff --git a/lib/am/check.am b/lib/am/check.am
index 7bcffd53f..741a5c0f0 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2015 Free Software Foundation, Inc.
+## Copyright (C) 2001-2017 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
diff --git a/lib/am/check2.am b/lib/am/check2.am
index b94d9cc1d..1a1c34fe8 100644
--- a/lib/am/check2.am
+++ b/lib/am/check2.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2008-2015 Free Software Foundation, Inc.
+## Copyright (C) 2008-2017 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
diff --git a/lib/am/clean-hdr.am b/lib/am/clean-hdr.am
index 82f22fdbf..9a12b6915 100644
--- a/lib/am/clean-hdr.am
+++ b/lib/am/clean-hdr.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/clean.am b/lib/am/clean.am
index 439b876ff..59d9544b0 100644
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/compile.am b/lib/am/compile.am
index 86c016bfd..c45b04f62 100644
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/configure.am b/lib/am/configure.am
index ad6717b41..ec0b293ad 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2015 Free Software Foundation, Inc.
+## Copyright (C) 2001-2017 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
diff --git a/lib/am/data.am b/lib/am/data.am
index fb21d4c6a..6facf0acd 100644
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index 84e57d899..75ec97dca 100644
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/depend.am b/lib/am/depend.am
index 7fb8bb9be..8ce0cd4c7 100644
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index d1478b916..ac782d404 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index cc5c50290..02dd06333 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2015 Free Software Foundation, Inc.
+## Copyright (C) 2001-2017 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
diff --git a/lib/am/footer.am b/lib/am/footer.am
index 45a91493b..07f538805 100644
--- a/lib/am/footer.am
+++ b/lib/am/footer.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index e8f2a94ab..309468491 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/header.am b/lib/am/header.am
index 36fe3e8c4..f2a0e9559 100644
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am
index 3b673d3d0..5581f679c 100644
--- a/lib/am/inst-vars.am
+++ b/lib/am/inst-vars.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2004-2015 Free Software Foundation, Inc.
+## Copyright (C) 2004-2017 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
diff --git a/lib/am/install.am b/lib/am/install.am
index 5c99cc3f0..5adcb52c0 100644
--- a/lib/am/install.am
+++ b/lib/am/install.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2015 Free Software Foundation, Inc.
+## Copyright (C) 2001-2017 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
diff --git a/lib/am/java.am b/lib/am/java.am
index f31707bfa..6398f0e6d 100644
--- a/lib/am/java.am
+++ b/lib/am/java.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998-2015 Free Software Foundation, Inc.
+## Copyright (C) 1998-2017 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
diff --git a/lib/am/lang-compile.am b/lib/am/lang-compile.am
index 01e843bca..545e0cf4e 100644
--- a/lib/am/lang-compile.am
+++ b/lib/am/lang-compile.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2015 Free Software Foundation, Inc.
+## Copyright (C) 2001-2017 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
diff --git a/lib/am/lex.am b/lib/am/lex.am
index d7ddc7728..c28674d11 100644
--- a/lib/am/lex.am
+++ b/lib/am/lex.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001-2015 Free Software Foundation, Inc.
+## Copyright (C) 2001-2017 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
diff --git a/lib/am/library.am b/lib/am/library.am
index 09d8ab6d8..8bb1390ae 100644
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/libs.am b/lib/am/libs.am
index b6d5caaf4..77f91787b 100644
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/libtool.am b/lib/am/libtool.am
index f91e0ffdc..a2f1ae55e 100644
--- a/lib/am/libtool.am
+++ b/lib/am/libtool.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index dfb66c7db..8085e3f0d 100644
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1996-2015 Free Software Foundation, Inc.
+## Copyright (C) 1996-2017 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
diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index 91bcdf15b..45f020327 100644
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am
index d11b52832..ce4c1faf5 100644
--- a/lib/am/ltlibrary.am
+++ b/lib/am/ltlibrary.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/mans-vars.am b/lib/am/mans-vars.am
index 18c7e3849..24b9e20c0 100644
--- a/lib/am/mans-vars.am
+++ b/lib/am/mans-vars.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/mans.am b/lib/am/mans.am
index 69a2df9ba..85c180821 100644
--- a/lib/am/mans.am
+++ b/lib/am/mans.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998-2015 Free Software Foundation, Inc.
+## Copyright (C) 1998-2017 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
diff --git a/lib/am/program.am b/lib/am/program.am
index 7fa2aa25a..ba1bbb553 100644
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/progs.am b/lib/am/progs.am
index 3dcb55e5e..4c94b5b19 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/python.am b/lib/am/python.am
index 5c48ac7ef..e20f602cf 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1999-2015 Free Software Foundation, Inc.
+## Copyright (C) 1999-2017 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
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index b5194dd32..dd26e4ef5 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index 4b3bcced5..5422392af 100644
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index cc00d5876..84102493c 100644
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/tags.am b/lib/am/tags.am
index 15cd4cfe7..7a93cde93 100644
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index eab6bd6ca..1806c3eac 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 2c258dfd2..1a4b294e4 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 92f9e98fb..33a68f56a 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-2015 Free Software Foundation, Inc.
+## Copyright (C) 1994-2017 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
diff --git a/lib/am/vala.am b/lib/am/vala.am
index fd85696f0..836e12e87 100644
--- a/lib/am/vala.am
+++ b/lib/am/vala.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2008-2015 Free Software Foundation, Inc.
+## Copyright (C) 2008-2017 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
diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index 2b3f92aac..be1bf77a7 100644
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1998-2015 Free Software Foundation, Inc.
+## Copyright (C) 1998-2017 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
diff --git a/lib/ar-lib b/lib/ar-lib
index 1700c5ed0..05094d34c 100755
--- a/lib/ar-lib
+++ b/lib/ar-lib
@@ -4,7 +4,7 @@
me=ar-lib
scriptversion=2012-03-01.08; # UTC
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 Free Software Foundation, Inc.
# Written by Peter Rosin .
#
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/compile b/lib/compile
index 4bfd30ccf..2ab71e4ea 100755
--- a/lib/compile
+++ b/lib/compile
@@ -3,7 +3,7 @@
scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/config.guess b/lib/config.guess
index dbfb9786c..3834ed295 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -1,6 +1,6 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2015 Free Software Foundation, Inc.
+# Copyright 1992-2017 Free Software Foundation, Inc.
timestamp='2015-01-01'
diff --git a/lib/config.sub b/lib/config.sub
index 6d2e94c8b..79d7d3146 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -1,6 +1,6 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2015 Free Software Foundation, Inc.
+# Copyright 1992-2017 Free Software Foundation, Inc.
timestamp='2015-01-01'
diff --git a/lib/depcomp b/lib/depcomp
index 28ce42a9b..b68723213 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -3,7 +3,7 @@
scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/lib/gendocs.sh b/lib/gendocs.sh
index e4bfc9fd2..198f6461d 100755
--- a/lib/gendocs.sh
+++ b/lib/gendocs.sh
@@ -4,8 +4,7 @@
scriptversion=2013-02-03.15
-# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-# Free Software Foundation, Inc.
+# Copyright 2003-2017 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
diff --git a/lib/gendocs_template b/lib/gendocs_template
index 63fbe539a..6809f7fb5 100644
--- a/lib/gendocs_template
+++ b/lib/gendocs_template
@@ -75,7 +75,7 @@ the FSF.
Please send broken links and other corrections or suggestions to
<%%EMAIL%%>.
-Copyright © 2013 Free Software Foundation, Inc.
+Copyright © 2013-2017 Free Software Foundation, Inc.
Verbatim copying and distribution of this entire article are
permitted worldwide, without royalty, in any medium, provided this
diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog
index de934c2da..e18b50bfb 100755
--- a/lib/gitlog-to-changelog
+++ b/lib/gitlog-to-changelog
@@ -9,7 +9,7 @@ my $VERSION = '2014-11-20 17:25'; # UTC
# If you change this file with Emacs, please let the write hook
# do its job. Otherwise, update this string manually.
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/lib/gnupload b/lib/gnupload
index 406a3f7e6..b3e4d2654 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -3,7 +3,7 @@
scriptversion=2013-03-19.17; # UTC
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/lib/mdate-sh b/lib/mdate-sh
index 6022eff65..f80075c04 100755
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -3,7 +3,7 @@
scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1995-2015 Free Software Foundation, Inc.
+# Copyright (C) 1995-2017 Free Software Foundation, Inc.
# written by Ulrich Drepper , June 1995
#
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/missing b/lib/missing
index 594918c78..c6e379584 100755
--- a/lib/missing
+++ b/lib/missing
@@ -3,7 +3,7 @@
scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/py-compile b/lib/py-compile
index b71283793..3693d96b0 100755
--- a/lib/py-compile
+++ b/lib/py-compile
@@ -3,7 +3,7 @@
scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh
index 616c09a97..82efa96c0 100755
--- a/lib/tap-driver.sh
+++ b/lib/tap-driver.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/lib/test-driver b/lib/test-driver
index d7eac829e..0218a01f6 100755
--- a/lib/test-driver
+++ b/lib/test-driver
@@ -3,7 +3,7 @@
scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index 85f184cc4..ab55d5b0c 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -5,9 +5,7 @@
%
\def\texinfoversion{2013-02-01.11}
%
-% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+% Copyright 1985-2017 Free Software Foundation, Inc.
%
% This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
diff --git a/lib/update-copyright b/lib/update-copyright
index 308fbf17f..ef9bdc0f2 100755
--- a/lib/update-copyright
+++ b/lib/update-copyright
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}'
my $VERSION = '2013-01-03.09:41'; # UTC
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/lib/ylwrap b/lib/ylwrap
index b299bd8f6..abac60c49 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -3,7 +3,7 @@
scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# Written by Tom Tromey .
#
diff --git a/m4/Makefile.inc b/m4/Makefile.inc
index 05a29ce32..287db844c 100644
--- a/m4/Makefile.inc
+++ b/m4/Makefile.inc
@@ -1,6 +1,6 @@
## Included by top-level Makefile for Automake.
-## Copyright (C) 1995-2015 Free Software Foundation, Inc.
+## Copyright (C) 1995-2017 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
diff --git a/m4/amversion.in b/m4/amversion.in
index 6d6a47c48..4b845d888 100644
--- a/m4/amversion.in
+++ b/m4/amversion.in
@@ -1,6 +1,6 @@
## -*- Autoconf -*-
## @configure_input@
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index d7d7e5cb3..1b14af5d2 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -1,6 +1,6 @@
## -*- Autoconf -*-
## Generated from amversion.in; do not edit by hand.
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/ar-lib.m4 b/m4/ar-lib.m4
index 914b21bc2..4fe6fb34b 100644
--- a/m4/ar-lib.m4
+++ b/m4/ar-lib.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/as.m4 b/m4/as.m4
index 19c29615f..70ffc2e25 100644
--- a/m4/as.m4
+++ b/m4/as.m4
@@ -1,6 +1,6 @@
# Figure out how to run the assembler. -*- Autoconf -*-
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/auxdir.m4 b/m4/auxdir.m4
index fd0e060bb..ae4327de2 100644
--- a/m4/auxdir.m4
+++ b/m4/auxdir.m4
@@ -1,6 +1,6 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/cond-if.m4 b/m4/cond-if.m4
index 1639cdff4..2c62bd33b 100644
--- a/m4/cond-if.m4
+++ b/m4/cond-if.m4
@@ -1,6 +1,6 @@
# AM_COND_IF -*- Autoconf -*-
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/cond.m4 b/m4/cond.m4
index e3c04e99c..2a889d466 100644
--- a/m4/cond.m4
+++ b/m4/cond.m4
@@ -1,6 +1,6 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/depend.m4 b/m4/depend.m4
index cc96730c5..f5dce4ec0 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/depout.m4 b/m4/depout.m4
index c3936a71d..204d47989 100644
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -1,6 +1,6 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4
index b94124639..0b9f8d4f4 100644
--- a/m4/dmalloc.m4
+++ b/m4/dmalloc.m4
@@ -3,7 +3,7 @@
## From Franc,ois Pinard ##
## ----------------------------------- ##
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/extra-recurs.m4 b/m4/extra-recurs.m4
index 64506b588..ac7df8eab 100644
--- a/m4/extra-recurs.m4
+++ b/m4/extra-recurs.m4
@@ -1,6 +1,6 @@
# AM_EXTRA_RECURSIVE_TARGETS -*- Autoconf -*-
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/gcj.m4 b/m4/gcj.m4
index 0f647a6ff..413971174 100644
--- a/m4/gcj.m4
+++ b/m4/gcj.m4
@@ -1,7 +1,7 @@
# Check for Java compiler. -*- Autoconf -*-
# For now we only handle the GNU compiler.
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/init.m4 b/m4/init.m4
index 723f6005c..054acbac7 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -1,6 +1,6 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/install-sh.m4 b/m4/install-sh.m4
index 411a9a23a..94b886a2a 100644
--- a/m4/install-sh.m4
+++ b/m4/install-sh.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/internal/ac-config-macro-dirs.m4 b/m4/internal/ac-config-macro-dirs.m4
index c62f506ef..cc05bbec5 100644
--- a/m4/internal/ac-config-macro-dirs.m4
+++ b/m4/internal/ac-config-macro-dirs.m4
@@ -4,7 +4,7 @@
# FIXME: keep in sync with the contents of the variable
# '$ac_config_macro_dirs_fallback' in aclocal.in.
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/lex.m4 b/m4/lex.m4
index cce0224b2..d729c3107 100644
--- a/m4/lex.m4
+++ b/m4/lex.m4
@@ -1,6 +1,6 @@
## Replacement for AC_PROG_LEX. -*- Autoconf -*-
## by Alexandre Oliva
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 1d5e1e98a..846ef3f0e 100644
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -3,7 +3,7 @@
## From Ulrich Drepper
## Almost entirely rewritten by Alexandre Oliva
## ------------------------
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/maintainer.m4 b/m4/maintainer.m4
index f1b13e992..33cb24ecc 100644
--- a/m4/maintainer.m4
+++ b/m4/maintainer.m4
@@ -1,7 +1,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/make.m4 b/m4/make.m4
index fff073329..d62dcfb22 100644
--- a/m4/make.m4
+++ b/m4/make.m4
@@ -1,6 +1,6 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/missing.m4 b/m4/missing.m4
index abc985f98..20be2a5e4 100644
--- a/m4/missing.m4
+++ b/m4/missing.m4
@@ -1,6 +1,6 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/obsolete.m4 b/m4/obsolete.m4
index f6d5a6111..2f9d3a861 100644
--- a/m4/obsolete.m4
+++ b/m4/obsolete.m4
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Deprecated, obsolescent or and obsolete macros.
#
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/options.m4 b/m4/options.m4
index ada0bc7d3..45cfa546a 100644
--- a/m4/options.m4
+++ b/m4/options.m4
@@ -1,6 +1,6 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/prog-cc-c-o.m4 b/m4/prog-cc-c-o.m4
index afacb62bd..c366078f5 100644
--- a/m4/prog-cc-c-o.m4
+++ b/m4/prog-cc-c-o.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/python.m4 b/m4/python.m4
index 32c30e299..790e68ba7 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -3,7 +3,7 @@
## From Andrew Dalke
## Updated by James Henstridge
## ------------------------
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/runlog.m4 b/m4/runlog.m4
index ed01ec623..a56b02757 100644
--- a/m4/runlog.m4
+++ b/m4/runlog.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/sanity.m4 b/m4/sanity.m4
index a209693fe..2dbdd213a 100644
--- a/m4/sanity.m4
+++ b/m4/sanity.m4
@@ -1,6 +1,6 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/silent.m4 b/m4/silent.m4
index 1b7ad70bc..6549ae39f 100644
--- a/m4/silent.m4
+++ b/m4/silent.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/strip.m4 b/m4/strip.m4
index 6c32a34ef..23b822006 100644
--- a/m4/strip.m4
+++ b/m4/strip.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/substnot.m4 b/m4/substnot.m4
index e98cc5104..f781aa0b8 100644
--- a/m4/substnot.m4
+++ b/m4/substnot.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/tar.m4 b/m4/tar.m4
index d8054cb2c..ba4704f47 100644
--- a/m4/tar.m4
+++ b/m4/tar.m4
@@ -1,6 +1,6 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/upc.m4 b/m4/upc.m4
index d0052256d..60e05ff1b 100644
--- a/m4/upc.m4
+++ b/m4/upc.m4
@@ -1,6 +1,6 @@
# Find a compiler for Unified Parallel C. -*- Autoconf -*-
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/m4/vala.m4 b/m4/vala.m4
index f3eeeef39..8b742d1c5 100644
--- a/m4/vala.m4
+++ b/m4/vala.m4
@@ -1,6 +1,6 @@
# Autoconf support for the Vala compiler
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/maintainer/am-ft b/maintainer/am-ft
index 9b51fd6b5..6bb7d97e5 100755
--- a/maintainer/am-ft
+++ b/maintainer/am-ft
@@ -2,7 +2,7 @@
# Remote testing of Automake tarballs made easy.
# This script requires Bash 4.x or later.
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/maintainer/am-xft b/maintainer/am-xft
index f2ec54d5c..98263babb 100755
--- a/maintainer/am-xft
+++ b/maintainer/am-xft
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index 0212fd972..1c2cb9629 100644
--- a/maintainer/maint.mk
+++ b/maintainer/maint.mk
@@ -1,6 +1,6 @@
# Maintainer makefile rules for Automake.
#
-# Copyright (C) 1995-2015 Free Software Foundation, Inc.
+# Copyright (C) 1995-2017 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
diff --git a/maintainer/rename-tests b/maintainer/rename-tests
index c6cc69829..8c643872b 100755
--- a/maintainer/rename-tests
+++ b/maintainer/rename-tests
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Convenience script to rename test cases in Automake.
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/maintainer/syntax-checks.mk b/maintainer/syntax-checks.mk
index d5fff4825..35311a117 100644
--- a/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@ -1,6 +1,6 @@
# Maintainer checks for Automake. Requires GNU make.
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/old/ChangeLog-tests b/old/ChangeLog-tests
index 26f79c267..24f76e02d 100644
--- a/old/ChangeLog-tests
+++ b/old/ChangeLog-tests
@@ -1442,7 +1442,7 @@ Sat Feb 10 17:08:39 1996 Tom Tromey
-----
-Copyright 2012-2015 Free Software Foundation, Inc.
+Copyright 2012-2017 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.00 b/old/ChangeLog.00
index dd8caa8fb..a15902f36 100644
--- a/old/ChangeLog.00
+++ b/old/ChangeLog.00
@@ -2205,7 +2205,7 @@
-----
-Copyright 1999-2015 Free Software Foundation, Inc.
+Copyright 1999-2017 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.01 b/old/ChangeLog.01
index 832153d78..a522ea76c 100644
--- a/old/ChangeLog.01
+++ b/old/ChangeLog.01
@@ -4931,7 +4931,7 @@
-----
-Copyright (C) 2001-2015 Free Software Foundation, Inc.
+Copyright (C) 2001-2017 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.02 b/old/ChangeLog.02
index df1297c33..bb3e9748a 100644
--- a/old/ChangeLog.02
+++ b/old/ChangeLog.02
@@ -3219,7 +3219,7 @@
-----
-Copyright (C) 2002-2015 Free Software Foundation, Inc.
+Copyright (C) 2002-2017 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.03 b/old/ChangeLog.03
index 685ca0e6a..77c4ecbe3 100644
--- a/old/ChangeLog.03
+++ b/old/ChangeLog.03
@@ -2965,7 +2965,7 @@
-----
-Copyright (C) 2003-2015 Free Software Foundation, Inc.
+Copyright (C) 2003-2017 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.04 b/old/ChangeLog.04
index 69eaf3628..0bbd2b028 100644
--- a/old/ChangeLog.04
+++ b/old/ChangeLog.04
@@ -1613,7 +1613,7 @@
-----
-Copyright (C) 2004-2015 Free Software Foundation, Inc.
+Copyright (C) 2004-2017 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.09 b/old/ChangeLog.09
index 0f021d648..748bfcb81 100644
--- a/old/ChangeLog.09
+++ b/old/ChangeLog.09
@@ -5757,7 +5757,7 @@
-----
-Copyright (C) 2005-2015 Free Software Foundation, Inc.
+Copyright (C) 2005-2017 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.11 b/old/ChangeLog.11
index da1f3af42..f7ec2c5e1 100644
--- a/old/ChangeLog.11
+++ b/old/ChangeLog.11
@@ -13097,7 +13097,7 @@
-----
-Copyright (C) 2010-2015 Free Software Foundation, Inc.
+Copyright (C) 2010-2017 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.96 b/old/ChangeLog.96
index 81232d48e..eaf1a9c6d 100644
--- a/old/ChangeLog.96
+++ b/old/ChangeLog.96
@@ -3679,7 +3679,7 @@ Mon Sep 19 23:39:21 1994 djm
-----
-Copyright 1994-2015 Free Software Foundation, Inc.
+Copyright 1994-2017 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/ChangeLog.98 b/old/ChangeLog.98
index a9fa322db..0dad2bdc3 100644
--- a/old/ChangeLog.98
+++ b/old/ChangeLog.98
@@ -2185,7 +2185,7 @@ Thu Jan 2 14:16:17 1997 Tom Tromey
-----
-Copyright 1997-2015 Free Software Foundation, Inc.
+Copyright 1997-2017 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification, are
permitted provided the copyright notice and this notice are preserved.
diff --git a/old/TODO b/old/TODO
index ad7fc4e1b..00c0346ba 100644
--- a/old/TODO
+++ b/old/TODO
@@ -483,7 +483,7 @@ that aren't mentioned?
* copyright notice
-Copyright 1994-2015 Free Software Foundation, Inc.
+Copyright 1994-2017 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
diff --git a/t/CheckListOfTests.am b/t/CheckListOfTests.am
index 46a019dc2..ca29b4762 100644
--- a/t/CheckListOfTests.am
+++ b/t/CheckListOfTests.am
@@ -1,6 +1,6 @@
## -*- Automake -*-
##
-## Copyright (C) 2011-2015 Free Software Foundation, Inc.
+## Copyright (C) 2011-2017 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
diff --git a/t/Makefile.inc b/t/Makefile.inc
index 6ced9266b..708e93397 100644
--- a/t/Makefile.inc
+++ b/t/Makefile.inc
@@ -1,6 +1,6 @@
## Included by top-level Makefile for Automake.
-## Copyright (C) 1995-2015 Free Software Foundation, Inc.
+## Copyright (C) 1995-2017 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
diff --git a/t/ac-output-old.tap b/t/ac-output-old.tap
index 871c1cca1..d5e17ab78 100644
--- a/t/ac-output-old.tap
+++ b/t/ac-output-old.tap
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/aclocal-I-and-install.sh b/t/aclocal-I-and-install.sh
index b84a75431..d906de7d7 100644
--- a/t/aclocal-I-and-install.sh
+++ b/t/aclocal-I-and-install.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/aclocal-I-order-1.sh b/t/aclocal-I-order-1.sh
index 9941c088a..46263ccfe 100644
--- a/t/aclocal-I-order-1.sh
+++ b/t/aclocal-I-order-1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/aclocal-I-order-2.sh b/t/aclocal-I-order-2.sh
index 4dc9dd058..b6790e472 100644
--- a/t/aclocal-I-order-2.sh
+++ b/t/aclocal-I-order-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/aclocal-I-order-3.sh b/t/aclocal-I-order-3.sh
index 023a562d3..a5d0d8fbc 100644
--- a/t/aclocal-I-order-3.sh
+++ b/t/aclocal-I-order-3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh
index cda6e406c..2016b95c4 100644
--- a/t/aclocal-acdir.sh
+++ b/t/aclocal-acdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/aclocal-amflags.sh b/t/aclocal-amflags.sh
index 852d11dab..fe1c08717 100644
--- a/t/aclocal-amflags.sh
+++ b/t/aclocal-amflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/aclocal-autoconf-version-check.sh b/t/aclocal-autoconf-version-check.sh
index 0be54b3bd..0709de003 100644
--- a/t/aclocal-autoconf-version-check.sh
+++ b/t/aclocal-autoconf-version-check.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/aclocal-comments-respected.sh b/t/aclocal-comments-respected.sh
index 4e872f722..41c12a9cf 100644
--- a/t/aclocal-comments-respected.sh
+++ b/t/aclocal-comments-respected.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/aclocal-deleted-header-aclocal-amflags.sh b/t/aclocal-deleted-header-aclocal-amflags.sh
index 51f9b8c68..306141cb1 100644
--- a/t/aclocal-deleted-header-aclocal-amflags.sh
+++ b/t/aclocal-deleted-header-aclocal-amflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2017 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
diff --git a/t/aclocal-deleted-header.sh b/t/aclocal-deleted-header.sh
index abff7d2e3..918f92951 100644
--- a/t/aclocal-deleted-header.sh
+++ b/t/aclocal-deleted-header.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2017 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
diff --git a/t/aclocal-deps-subdir.sh b/t/aclocal-deps-subdir.sh
index 570426783..ec53bf91c 100644
--- a/t/aclocal-deps-subdir.sh
+++ b/t/aclocal-deps-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/aclocal-deps.sh b/t/aclocal-deps.sh
index 52e0b839b..edb5beeed 100644
--- a/t/aclocal-deps.sh
+++ b/t/aclocal-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/aclocal-dirlist-abspath.sh b/t/aclocal-dirlist-abspath.sh
index 42719c20f..9e1f0416f 100644
--- a/t/aclocal-dirlist-abspath.sh
+++ b/t/aclocal-dirlist-abspath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/aclocal-dirlist-globbing.sh b/t/aclocal-dirlist-globbing.sh
index db635098f..0451efcea 100644
--- a/t/aclocal-dirlist-globbing.sh
+++ b/t/aclocal-dirlist-globbing.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/aclocal-dirlist.sh b/t/aclocal-dirlist.sh
index 8ecd1f7d2..e3cc1eaee 100644
--- a/t/aclocal-dirlist.sh
+++ b/t/aclocal-dirlist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/aclocal-install-absdir.sh b/t/aclocal-install-absdir.sh
index 71e383645..973d7421f 100644
--- a/t/aclocal-install-absdir.sh
+++ b/t/aclocal-install-absdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/aclocal-install-fail.sh b/t/aclocal-install-fail.sh
index 33aa56aba..d9651ca0f 100644
--- a/t/aclocal-install-fail.sh
+++ b/t/aclocal-install-fail.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/aclocal-install-mkdir.sh b/t/aclocal-install-mkdir.sh
index c9512a0ae..556cff6c3 100644
--- a/t/aclocal-install-mkdir.sh
+++ b/t/aclocal-install-mkdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
index 29df4aba6..db46e5c25 100644
--- a/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
+++ b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/aclocal-m4-include-are-scanned.sh b/t/aclocal-m4-include-are-scanned.sh
index d0cf15e3d..96e70b90b 100644
--- a/t/aclocal-m4-include-are-scanned.sh
+++ b/t/aclocal-m4-include-are-scanned.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/aclocal-m4-sinclude.sh b/t/aclocal-m4-sinclude.sh
index 3bd9a1fc6..507230fb2 100644
--- a/t/aclocal-m4-sinclude.sh
+++ b/t/aclocal-m4-sinclude.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/aclocal-macrodir.tap b/t/aclocal-macrodir.tap
index 93a63e714..877dccd4f 100644
--- a/t/aclocal-macrodir.tap
+++ b/t/aclocal-macrodir.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/aclocal-macrodirs.tap b/t/aclocal-macrodirs.tap
index 2b7c5a438..b43410a84 100644
--- a/t/aclocal-macrodirs.tap
+++ b/t/aclocal-macrodirs.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/aclocal-missing-macros.sh b/t/aclocal-missing-macros.sh
index f27267c55..92fde75f7 100644
--- a/t/aclocal-missing-macros.sh
+++ b/t/aclocal-missing-macros.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/aclocal-no-extra-scan.sh b/t/aclocal-no-extra-scan.sh
index ed51162a7..eb629f04e 100644
--- a/t/aclocal-no-extra-scan.sh
+++ b/t/aclocal-no-extra-scan.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/aclocal-no-force.sh b/t/aclocal-no-force.sh
index 2b8db0b60..4c15d0191 100644
--- a/t/aclocal-no-force.sh
+++ b/t/aclocal-no-force.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/aclocal-no-install-no-mkdir.sh b/t/aclocal-no-install-no-mkdir.sh
index 7b8bc87a4..bbcf624f6 100644
--- a/t/aclocal-no-install-no-mkdir.sh
+++ b/t/aclocal-no-install-no-mkdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/aclocal-no-symlinked-overwrite.sh b/t/aclocal-no-symlinked-overwrite.sh
index f8912dffc..c0f0140dd 100644
--- a/t/aclocal-no-symlinked-overwrite.sh
+++ b/t/aclocal-no-symlinked-overwrite.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/aclocal-no-unused-required.sh b/t/aclocal-no-unused-required.sh
index 462b97a97..eb8ae39f9 100644
--- a/t/aclocal-no-unused-required.sh
+++ b/t/aclocal-no-unused-required.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/aclocal-path-install-serial.sh b/t/aclocal-path-install-serial.sh
index fa182e29d..ccbdb16ce 100644
--- a/t/aclocal-path-install-serial.sh
+++ b/t/aclocal-path-install-serial.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/aclocal-path-install.sh b/t/aclocal-path-install.sh
index 9992d87c7..6b5815032 100644
--- a/t/aclocal-path-install.sh
+++ b/t/aclocal-path-install.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/aclocal-path-nonexistent.sh b/t/aclocal-path-nonexistent.sh
index 9b2d64785..88451b28d 100644
--- a/t/aclocal-path-nonexistent.sh
+++ b/t/aclocal-path-nonexistent.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/aclocal-path-precedence.sh b/t/aclocal-path-precedence.sh
index c943540a1..1f8a1183d 100644
--- a/t/aclocal-path-precedence.sh
+++ b/t/aclocal-path-precedence.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/aclocal-path.sh b/t/aclocal-path.sh
index f65626e66..d10b30a83 100644
--- a/t/aclocal-path.sh
+++ b/t/aclocal-path.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/aclocal-pr450.sh b/t/aclocal-pr450.sh
index 952b3049c..7c52de56a 100644
--- a/t/aclocal-pr450.sh
+++ b/t/aclocal-pr450.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/aclocal-print-acdir.sh b/t/aclocal-print-acdir.sh
index 78fced734..c6fa41450 100644
--- a/t/aclocal-print-acdir.sh
+++ b/t/aclocal-print-acdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/aclocal-remake-misc.sh b/t/aclocal-remake-misc.sh
index 6dc90151a..c1f01dd13 100644
--- a/t/aclocal-remake-misc.sh
+++ b/t/aclocal-remake-misc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/aclocal-req.sh b/t/aclocal-req.sh
index 1127f4ca9..92cf333b8 100644
--- a/t/aclocal-req.sh
+++ b/t/aclocal-req.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/aclocal-scan-configure-ac-pr319.sh b/t/aclocal-scan-configure-ac-pr319.sh
index e88358483..8de0897e7 100644
--- a/t/aclocal-scan-configure-ac-pr319.sh
+++ b/t/aclocal-scan-configure-ac-pr319.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/aclocal-serial.sh b/t/aclocal-serial.sh
index 82402d58a..e256cd020 100644
--- a/t/aclocal-serial.sh
+++ b/t/aclocal-serial.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/aclocal-underquoted-defun.sh b/t/aclocal-underquoted-defun.sh
index 2964521da..2f07c03e9 100644
--- a/t/aclocal-underquoted-defun.sh
+++ b/t/aclocal-underquoted-defun.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/aclocal-verbose-install.sh b/t/aclocal-verbose-install.sh
index 9b4ccf745..de6ea9139 100644
--- a/t/aclocal-verbose-install.sh
+++ b/t/aclocal-verbose-install.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/aclocal.sh b/t/aclocal.sh
index 5bcccc37e..64e1aa847 100644
--- a/t/aclocal.sh
+++ b/t/aclocal.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/acsilent.sh b/t/acsilent.sh
index b9183acd4..215763055 100644
--- a/t/acsilent.sh
+++ b/t/acsilent.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/acsubst.sh b/t/acsubst.sh
index 1480b8f5e..c05e890b1 100644
--- a/t/acsubst.sh
+++ b/t/acsubst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/acsubst2.sh b/t/acsubst2.sh
index f40677eca..60ccf29ba 100644
--- a/t/acsubst2.sh
+++ b/t/acsubst2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/add-missing-install-sh.sh b/t/add-missing-install-sh.sh
index 3334a89a6..ba21c87d3 100644
--- a/t/add-missing-install-sh.sh
+++ b/t/add-missing-install-sh.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/add-missing-multiple.sh b/t/add-missing-multiple.sh
index a335775fa..5f0772b1d 100644
--- a/t/add-missing-multiple.sh
+++ b/t/add-missing-multiple.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/add-missing.tap b/t/add-missing.tap
index b3ea29d42..512602c7d 100644
--- a/t/add-missing.tap
+++ b/t/add-missing.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/all.sh b/t/all.sh
index de3f200a0..70b1abf38 100644
--- a/t/all.sh
+++ b/t/all.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/all2.sh b/t/all2.sh
index dcb2c059f..d80b62b3c 100644
--- a/t/all2.sh
+++ b/t/all2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/alloca.sh b/t/alloca.sh
index 61afadd2b..b56ce89c9 100644
--- a/t/alloca.sh
+++ b/t/alloca.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/alloca2.sh b/t/alloca2.sh
index 2a79d2168..8be2c56b0 100644
--- a/t/alloca2.sh
+++ b/t/alloca2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/alpha.sh b/t/alpha.sh
index 14c999fb6..35df26e88 100644
--- a/t/alpha.sh
+++ b/t/alpha.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/alpha2.sh b/t/alpha2.sh
index 2643233d0..0f3fb1702 100644
--- a/t/alpha2.sh
+++ b/t/alpha2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/am-config-header.sh b/t/am-config-header.sh
index a29c33bdb..945cf237c 100644
--- a/t/am-config-header.sh
+++ b/t/am-config-header.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/am-default-source-ext.sh b/t/am-default-source-ext.sh
index fb055c223..d42193d85 100644
--- a/t/am-default-source-ext.sh
+++ b/t/am-default-source-ext.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/am-include-only-one-generated-fragment.sh b/t/am-include-only-one-generated-fragment.sh
index 89e9db016..f0c6834e4 100644
--- a/t/am-include-only-one-generated-fragment.sh
+++ b/t/am-include-only-one-generated-fragment.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2014-2015 Free Software Foundation, Inc.
+# Copyright (C) 2014-2017 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
diff --git a/t/am-macro-not-found.sh b/t/am-macro-not-found.sh
index 1d1e1df77..aed653563 100644
--- a/t/am-macro-not-found.sh
+++ b/t/am-macro-not-found.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/am-missing-prog.sh b/t/am-missing-prog.sh
index c5f1f3560..b76b8f3b0 100644
--- a/t/am-missing-prog.sh
+++ b/t/am-missing-prog.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/am-prog-cc-c-o.sh b/t/am-prog-cc-c-o.sh
index 62f469b04..b5439c83f 100644
--- a/t/am-prog-cc-c-o.sh
+++ b/t/am-prog-cc-c-o.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/am-prog-cc-stdc.sh b/t/am-prog-cc-stdc.sh
index 4a999232c..6f9903fa4 100644
--- a/t/am-prog-cc-stdc.sh
+++ b/t/am-prog-cc-stdc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/am-prog-mkdir-p.sh b/t/am-prog-mkdir-p.sh
index 744d6b5d1..477148aab 100644
--- a/t/am-prog-mkdir-p.sh
+++ b/t/am-prog-mkdir-p.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/am-tests-environment.sh b/t/am-tests-environment.sh
index 668a811d3..d29c99577 100644
--- a/t/am-tests-environment.sh
+++ b/t/am-tests-environment.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/amassign.sh b/t/amassign.sh
index 4d298592a..9d89101ed 100644
--- a/t/amassign.sh
+++ b/t/amassign.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/amhello-binpkg.sh b/t/amhello-binpkg.sh
index 87085635a..5f2501ca9 100644
--- a/t/amhello-binpkg.sh
+++ b/t/amhello-binpkg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/amhello-cflags.sh b/t/amhello-cflags.sh
index 4c0c9fe61..9d1cfc757 100644
--- a/t/amhello-cflags.sh
+++ b/t/amhello-cflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/amhello-cross-compile.sh b/t/amhello-cross-compile.sh
index 66555d219..556fd46a9 100644
--- a/t/amhello-cross-compile.sh
+++ b/t/amhello-cross-compile.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/aminit-moreargs-deprecation.sh b/t/aminit-moreargs-deprecation.sh
index 4a36ed4af..045d9f35b 100644
--- a/t/aminit-moreargs-deprecation.sh
+++ b/t/aminit-moreargs-deprecation.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/aminit-trailing-dnl-comment-pr16841.sh b/t/aminit-trailing-dnl-comment-pr16841.sh
index 618bb2d84..a238eee76 100644
--- a/t/aminit-trailing-dnl-comment-pr16841.sh
+++ b/t/aminit-trailing-dnl-comment-pr16841.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2014-2015 Free Software Foundation, Inc.
+# Copyright (C) 2014-2017 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
diff --git a/t/amopt.sh b/t/amopt.sh
index 39b18c557..d70cdea8a 100644
--- a/t/amopt.sh
+++ b/t/amopt.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/amopts-location.sh b/t/amopts-location.sh
index f6b25840a..9c1ad3655 100644
--- a/t/amopts-location.sh
+++ b/t/amopts-location.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/amopts-variable-expansion.sh b/t/amopts-variable-expansion.sh
index d76d00a38..bae72d60c 100644
--- a/t/amopts-variable-expansion.sh
+++ b/t/amopts-variable-expansion.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/amsubst.sh b/t/amsubst.sh
index 621bff4db..d8fda789b 100644
--- a/t/amsubst.sh
+++ b/t/amsubst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/ansi2knr-no-more.sh b/t/ansi2knr-no-more.sh
index cd7dcee1f..f9128022b 100644
--- a/t/ansi2knr-no-more.sh
+++ b/t/ansi2knr-no-more.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ar-lib.sh b/t/ar-lib.sh
index e2b4c5e91..b59470bc7 100644
--- a/t/ar-lib.sh
+++ b/t/ar-lib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/ar-lib2.sh b/t/ar-lib2.sh
index 2598296b2..e144a3ae7 100644
--- a/t/ar-lib2.sh
+++ b/t/ar-lib2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ar-lib3.sh b/t/ar-lib3.sh
index 6aeea286f..836da72e0 100644
--- a/t/ar-lib3.sh
+++ b/t/ar-lib3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ar-lib4.sh b/t/ar-lib4.sh
index 6f340f72c..867571b87 100644
--- a/t/ar-lib4.sh
+++ b/t/ar-lib4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ar-lib5a.sh b/t/ar-lib5a.sh
index c6570e710..1b19d14a5 100644
--- a/t/ar-lib5a.sh
+++ b/t/ar-lib5a.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ar-lib5b.sh b/t/ar-lib5b.sh
index 596fb1fe0..675745a31 100644
--- a/t/ar-lib5b.sh
+++ b/t/ar-lib5b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ar-lib6a.sh b/t/ar-lib6a.sh
index 9d95ebd04..6fd1e400b 100644
--- a/t/ar-lib6a.sh
+++ b/t/ar-lib6a.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ar-lib6b.sh b/t/ar-lib6b.sh
index bdb50424d..53fb1cf21 100644
--- a/t/ar-lib6b.sh
+++ b/t/ar-lib6b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ar-lib7.sh b/t/ar-lib7.sh
index a877f0a91..fdea9d862 100644
--- a/t/ar-lib7.sh
+++ b/t/ar-lib7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ar.sh b/t/ar.sh
index eb1aa13d6..b2eba8eb8 100644
--- a/t/ar.sh
+++ b/t/ar.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/ar2.sh b/t/ar2.sh
index 2f7d78d48..b6a98891b 100644
--- a/t/ar2.sh
+++ b/t/ar2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/ar3.sh b/t/ar3.sh
index 0a2530bb1..2fd66ab70 100644
--- a/t/ar3.sh
+++ b/t/ar3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ar4.sh b/t/ar4.sh
index 180b67f8b..34e6fd8a1 100644
--- a/t/ar4.sh
+++ b/t/ar4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ar5.sh b/t/ar5.sh
index 9d4609830..2c1660bbe 100644
--- a/t/ar5.sh
+++ b/t/ar5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/asm.sh b/t/asm.sh
index 7db5c7d1c..bc0121fa1 100644
--- a/t/asm.sh
+++ b/t/asm.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/asm2.sh b/t/asm2.sh
index 78dea438e..02e2a3cd9 100644
--- a/t/asm2.sh
+++ b/t/asm2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/asm3.sh b/t/asm3.sh
index 71ac14cb5..97d12e1d1 100644
--- a/t/asm3.sh
+++ b/t/asm3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/autodist-acconfig-no-subdir.sh b/t/autodist-acconfig-no-subdir.sh
index 85a24a3bb..1a193ae5a 100644
--- a/t/autodist-acconfig-no-subdir.sh
+++ b/t/autodist-acconfig-no-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/autodist-acconfig.sh b/t/autodist-acconfig.sh
index 939aaf11f..12f2c457d 100644
--- a/t/autodist-acconfig.sh
+++ b/t/autodist-acconfig.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/autodist-aclocal-m4.sh b/t/autodist-aclocal-m4.sh
index a57c1a7ce..1a5c705f8 100644
--- a/t/autodist-aclocal-m4.sh
+++ b/t/autodist-aclocal-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/autodist-config-headers.sh b/t/autodist-config-headers.sh
index 541f5c7f7..69ba829e8 100644
--- a/t/autodist-config-headers.sh
+++ b/t/autodist-config-headers.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/autodist-configure-no-subdir.sh b/t/autodist-configure-no-subdir.sh
index 267e36df9..9b9029cc0 100644
--- a/t/autodist-configure-no-subdir.sh
+++ b/t/autodist-configure-no-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/autodist-no-duplicate.sh b/t/autodist-no-duplicate.sh
index c900f74b6..03456b066 100644
--- a/t/autodist-no-duplicate.sh
+++ b/t/autodist-no-duplicate.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/autodist-stamp-vti.sh b/t/autodist-stamp-vti.sh
index 06e2a642d..4710c3b6d 100644
--- a/t/autodist-stamp-vti.sh
+++ b/t/autodist-stamp-vti.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/autodist-subdir.sh b/t/autodist-subdir.sh
index b66584d6b..cb4425821 100644
--- a/t/autodist-subdir.sh
+++ b/t/autodist-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/autodist.sh b/t/autodist.sh
index 958c6dd2e..417363b96 100644
--- a/t/autodist.sh
+++ b/t/autodist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/autohdr-subdir-pr12495.sh b/t/autohdr-subdir-pr12495.sh
index d940b05c7..c98d44f3d 100644
--- a/t/autohdr-subdir-pr12495.sh
+++ b/t/autohdr-subdir-pr12495.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/autohdr.sh b/t/autohdr.sh
index 6a55ccd81..7cdd96cfc 100644
--- a/t/autohdr.sh
+++ b/t/autohdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/autohdr3.sh b/t/autohdr3.sh
index 47e508b58..08f6ee778 100644
--- a/t/autohdr3.sh
+++ b/t/autohdr3.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/autohdr4.sh b/t/autohdr4.sh
index 3267ba66f..2dba7dfaf 100644
--- a/t/autohdr4.sh
+++ b/t/autohdr4.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/autohdrdry.sh b/t/autohdrdry.sh
index 165b5d074..4c5d2e5a6 100644
--- a/t/autohdrdry.sh
+++ b/t/autohdrdry.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/automake-cmdline.tap b/t/automake-cmdline.tap
index ed18f8b43..b94fbeba5 100644
--- a/t/automake-cmdline.tap
+++ b/t/automake-cmdline.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/auxdir-autodetect.sh b/t/auxdir-autodetect.sh
index 033521545..535efce47 100644
--- a/t/auxdir-autodetect.sh
+++ b/t/auxdir-autodetect.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/auxdir-cc-pr15981.sh b/t/auxdir-cc-pr15981.sh
index 578d49ee6..0780ae6f5 100644
--- a/t/auxdir-cc-pr15981.sh
+++ b/t/auxdir-cc-pr15981.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2014-2015 Free Software Foundation, Inc.
+# Copyright (C) 2014-2017 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
diff --git a/t/auxdir-computed.tap b/t/auxdir-computed.tap
index 128f778ac..6201fdbd4 100644
--- a/t/auxdir-computed.tap
+++ b/t/auxdir-computed.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/auxdir-misplaced.sh b/t/auxdir-misplaced.sh
index 5a7fff486..a82c9afd8 100644
--- a/t/auxdir-misplaced.sh
+++ b/t/auxdir-misplaced.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/auxdir-nonexistent.sh b/t/auxdir-nonexistent.sh
index 3b25c7b8b..f4da1f671 100644
--- a/t/auxdir-nonexistent.sh
+++ b/t/auxdir-nonexistent.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/auxdir-pr15981.sh b/t/auxdir-pr15981.sh
index 82ede292c..c881f8efc 100644
--- a/t/auxdir-pr15981.sh
+++ b/t/auxdir-pr15981.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2014-2015 Free Software Foundation, Inc.
+# Copyright (C) 2014-2017 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
diff --git a/t/auxdir-pr19311.sh b/t/auxdir-pr19311.sh
index 204a893c0..0fcf5e634 100644
--- a/t/auxdir-pr19311.sh
+++ b/t/auxdir-pr19311.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2014-2015 Free Software Foundation, Inc.
+# Copyright (C) 2014-2017 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
diff --git a/t/auxdir-unportable.tap b/t/auxdir-unportable.tap
index 6e9f72daa..4c465b5a3 100644
--- a/t/auxdir-unportable.tap
+++ b/t/auxdir-unportable.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/auxdir.sh b/t/auxdir.sh
index 039bc0c14..c280a734b 100644
--- a/t/auxdir.sh
+++ b/t/auxdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/auxdir6.sh b/t/auxdir6.sh
index b40d0617c..a9cba8ff7 100644
--- a/t/auxdir6.sh
+++ b/t/auxdir6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/auxdir7.sh b/t/auxdir7.sh
index 16402f444..20c496d1a 100644
--- a/t/auxdir7.sh
+++ b/t/auxdir7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/auxdir8.sh b/t/auxdir8.sh
index 38957bfcc..de9c65199 100644
--- a/t/auxdir8.sh
+++ b/t/auxdir8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index 529d93bcd..f85c1b535 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -1,6 +1,6 @@
# -*- shell-script -*-
#
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/ax/cc-no-c-o.in b/t/ax/cc-no-c-o.in
index 7015d75fe..9bc802acd 100644
--- a/t/ax/cc-no-c-o.in
+++ b/t/ax/cc-no-c-o.in
@@ -1,5 +1,5 @@
#! @AM_TEST_RUNNER_SHELL@
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/ax/deltree.pl b/t/ax/deltree.pl
index 5027fe2d7..5148dc2d6 100644
--- a/t/ax/deltree.pl
+++ b/t/ax/deltree.pl
@@ -2,7 +2,7 @@
# deltree: recursively removes file and directory,
# trying to handle permissions and other complications.
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh
index f54f8d416..9d0036cdf 100644
--- a/t/ax/depcomp.sh
+++ b/t/ax/depcomp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/ax/distcheck-hook-m4.am b/t/ax/distcheck-hook-m4.am
index 76772e0ca..f71793782 100644
--- a/t/ax/distcheck-hook-m4.am
+++ b/t/ax/distcheck-hook-m4.am
@@ -1,6 +1,6 @@
## Data files for some tests. Not used in the automake build system.
##
-## Copyright (C) 2011-2015 Free Software Foundation, Inc.
+## Copyright (C) 2011-2017 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
diff --git a/t/ax/extract-testsuite-summary.pl b/t/ax/extract-testsuite-summary.pl
index 64d8801ff..180f53926 100644
--- a/t/ax/extract-testsuite-summary.pl
+++ b/t/ax/extract-testsuite-summary.pl
@@ -2,7 +2,7 @@
# Extract the testsuite summary generated by the parallel testsuite
# harness from the output of "make check".
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/ax/is b/t/ax/is
index 85d4eed4a..c085793b5 100755
--- a/t/ax/is
+++ b/t/ax/is
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/ax/is_newest b/t/ax/is_newest
index 42389eaf7..1cf0da1c9 100755
--- a/t/ax/is_newest
+++ b/t/ax/is_newest
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/ax/runtest.in b/t/ax/runtest.in
index 635d40f9d..7caceb2a9 100644
--- a/t/ax/runtest.in
+++ b/t/ax/runtest.in
@@ -1,7 +1,7 @@
#!@AM_TEST_RUNNER_SHELL@
# @configure_input@
#
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/ax/shell-no-trail-bslash.in b/t/ax/shell-no-trail-bslash.in
index e241eb801..eefd90ea3 100644
--- a/t/ax/shell-no-trail-bslash.in
+++ b/t/ax/shell-no-trail-bslash.in
@@ -1,5 +1,5 @@
#! @AM_TEST_RUNNER_SHELL@
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/ax/tap-functions.sh b/t/ax/tap-functions.sh
index f1021277b..17a6c11b3 100644
--- a/t/ax/tap-functions.sh
+++ b/t/ax/tap-functions.sh
@@ -1,6 +1,6 @@
# -*- shell-script -*-
#
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ax/tap-setup.sh b/t/ax/tap-setup.sh
index fc67db781..0eae2a386 100644
--- a/t/ax/tap-setup.sh
+++ b/t/ax/tap-setup.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh
index d87a4a988..1f22f3fe7 100644
--- a/t/ax/tap-summary-aux.sh
+++ b/t/ax/tap-summary-aux.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in
index 456011450..2465c61c1 100644
--- a/t/ax/test-defs.in
+++ b/t/ax/test-defs.in
@@ -1,7 +1,7 @@
# -*- shell-script -*-
# @configure_input@
#
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/ax/test-init.sh b/t/ax/test-init.sh
index b58a77a2c..bf9017f4c 100644
--- a/t/ax/test-init.sh
+++ b/t/ax/test-init.sh
@@ -1,6 +1,6 @@
# -*- shell-script -*-
#
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/ax/test-lib.sh b/t/ax/test-lib.sh
index adbb42acd..2ed15dcf9 100644
--- a/t/ax/test-lib.sh
+++ b/t/ax/test-lib.sh
@@ -1,6 +1,6 @@
# -*- shell-script -*-
#
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh
index b9ba31ef1..1d4b9f5cb 100644
--- a/t/ax/testsuite-summary-checks.sh
+++ b/t/ax/testsuite-summary-checks.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ax/trivial-test-driver b/t/ax/trivial-test-driver
index d8fa6e99f..8885fb331 100644
--- a/t/ax/trivial-test-driver
+++ b/t/ax/trivial-test-driver
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/backcompat-acout.sh b/t/backcompat-acout.sh
index e37d6a97a..bfe0a28bc 100644
--- a/t/backcompat-acout.sh
+++ b/t/backcompat-acout.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/backcompat.sh b/t/backcompat.sh
index c49209557..a61400cd3 100644
--- a/t/backcompat.sh
+++ b/t/backcompat.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/backcompat2.sh b/t/backcompat2.sh
index c278cf213..7f2e9e214 100644
--- a/t/backcompat2.sh
+++ b/t/backcompat2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/backcompat3.sh b/t/backcompat3.sh
index e401903ce..718d0ad4a 100644
--- a/t/backcompat3.sh
+++ b/t/backcompat3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/backcompat6.sh b/t/backcompat6.sh
index 7802b9950..52b7a1a9d 100644
--- a/t/backcompat6.sh
+++ b/t/backcompat6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/backslash-before-trailing-whitespace.sh b/t/backslash-before-trailing-whitespace.sh
index 6dbe53e78..f024404e1 100644
--- a/t/backslash-before-trailing-whitespace.sh
+++ b/t/backslash-before-trailing-whitespace.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/backslash-issues.sh b/t/backslash-issues.sh
index e0183a97d..c0c326272 100644
--- a/t/backslash-issues.sh
+++ b/t/backslash-issues.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/badline.sh b/t/badline.sh
index aec44bb5e..5dd23ec26 100644
--- a/t/badline.sh
+++ b/t/badline.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/badopt.sh b/t/badopt.sh
index 032a8d628..1b2d09973 100644
--- a/t/badopt.sh
+++ b/t/badopt.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/badprog.sh b/t/badprog.sh
index 56cb36c09..8b2dbbd95 100644
--- a/t/badprog.sh
+++ b/t/badprog.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/built-sources-check.sh b/t/built-sources-check.sh
index c94b91c11..170dafbc9 100644
--- a/t/built-sources-check.sh
+++ b/t/built-sources-check.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/built-sources-cond.sh b/t/built-sources-cond.sh
index 0463673a7..5ec58fded 100644
--- a/t/built-sources-cond.sh
+++ b/t/built-sources-cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/built-sources-fork-bomb.sh b/t/built-sources-fork-bomb.sh
index d99bd015c..4c58fcfc6 100644
--- a/t/built-sources-fork-bomb.sh
+++ b/t/built-sources-fork-bomb.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/built-sources-install.sh b/t/built-sources-install.sh
index e0b720216..6a59aa2fd 100644
--- a/t/built-sources-install.sh
+++ b/t/built-sources-install.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/built-sources-subdir.sh b/t/built-sources-subdir.sh
index 5f492a9df..04b529881 100644
--- a/t/built-sources-subdir.sh
+++ b/t/built-sources-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/built-sources.sh b/t/built-sources.sh
index 9d4dbc7dd..139cf4e6a 100644
--- a/t/built-sources.sh
+++ b/t/built-sources.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/c-demo.sh b/t/c-demo.sh
index 0458ba19b..4a2c8d100 100644
--- a/t/c-demo.sh
+++ b/t/c-demo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/candist.sh b/t/candist.sh
index cdfee10ad..d723b264b 100644
--- a/t/candist.sh
+++ b/t/candist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/canon-name.sh b/t/canon-name.sh
index fd1e19d5f..520d5f0cf 100644
--- a/t/canon-name.sh
+++ b/t/canon-name.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2017 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
diff --git a/t/canon.sh b/t/canon.sh
index 2fc37ea8c..ca7c92b4e 100644
--- a/t/canon.sh
+++ b/t/canon.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/canon2.sh b/t/canon2.sh
index e5ec9dbfb..b72c1b241 100644
--- a/t/canon2.sh
+++ b/t/canon2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/canon3.sh b/t/canon3.sh
index 81117c219..853eb25af 100644
--- a/t/canon3.sh
+++ b/t/canon3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/canon4.sh b/t/canon4.sh
index 4aaf930db..e68419f99 100644
--- a/t/canon4.sh
+++ b/t/canon4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/canon5.sh b/t/canon5.sh
index f19e803f0..098effcfb 100644
--- a/t/canon5.sh
+++ b/t/canon5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/canon6.sh b/t/canon6.sh
index c66284402..01b3939c4 100644
--- a/t/canon6.sh
+++ b/t/canon6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/canon7.sh b/t/canon7.sh
index 074898569..fe44e76a8 100644
--- a/t/canon7.sh
+++ b/t/canon7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/canon8.sh b/t/canon8.sh
index cb12f7c0c..66e861649 100644
--- a/t/canon8.sh
+++ b/t/canon8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/ccnoco-deps.sh b/t/ccnoco-deps.sh
index 4e6e1e049..ea44a9158 100755
--- a/t/ccnoco-deps.sh
+++ b/t/ccnoco-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/ccnoco-lib.sh b/t/ccnoco-lib.sh
index 7f32d2995..09a8835be 100755
--- a/t/ccnoco-lib.sh
+++ b/t/ccnoco-lib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/ccnoco-lt.sh b/t/ccnoco-lt.sh
index fb21ae59b..6cec96a66 100755
--- a/t/ccnoco-lt.sh
+++ b/t/ccnoco-lt.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/ccnoco.sh b/t/ccnoco.sh
index 7e6981d44..ac61ba62f 100644
--- a/t/ccnoco.sh
+++ b/t/ccnoco.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/ccnoco3.sh b/t/ccnoco3.sh
index 429d3c9db..75c193cbe 100644
--- a/t/ccnoco3.sh
+++ b/t/ccnoco3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/ccnoco4.sh b/t/ccnoco4.sh
index bce2c40a8..eba300275 100644
--- a/t/ccnoco4.sh
+++ b/t/ccnoco4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/check-concurrency-bug9245.sh b/t/check-concurrency-bug9245.sh
index 2fc0b048b..78c274c99 100644
--- a/t/check-concurrency-bug9245.sh
+++ b/t/check-concurrency-bug9245.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/check-exported-srcdir.sh b/t/check-exported-srcdir.sh
index 393d70275..688344d7e 100644
--- a/t/check-exported-srcdir.sh
+++ b/t/check-exported-srcdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/check-fd-redirect.sh b/t/check-fd-redirect.sh
index 9c7604f0c..c668d4e50 100644
--- a/t/check-fd-redirect.sh
+++ b/t/check-fd-redirect.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/check-no-test-driver.sh b/t/check-no-test-driver.sh
index a980eca03..36f6f7352 100644
--- a/t/check-no-test-driver.sh
+++ b/t/check-no-test-driver.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/check-subst-prog.sh b/t/check-subst-prog.sh
index 739714d82..237ad298d 100644
--- a/t/check-subst-prog.sh
+++ b/t/check-subst-prog.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/check-subst.sh b/t/check-subst.sh
index fafae7d95..77886d464 100644
--- a/t/check-subst.sh
+++ b/t/check-subst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/check-tests-in-builddir.sh b/t/check-tests-in-builddir.sh
index 41246fe44..b9070bc5f 100644
--- a/t/check-tests-in-builddir.sh
+++ b/t/check-tests-in-builddir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/check.sh b/t/check.sh
index a418590e0..b7956cc64 100644
--- a/t/check.sh
+++ b/t/check.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/check10.sh b/t/check10.sh
index 95bcaea57..92a023388 100644
--- a/t/check10.sh
+++ b/t/check10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/check11.sh b/t/check11.sh
index 7ce602668..9f34405f6 100644
--- a/t/check11.sh
+++ b/t/check11.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/check12.sh b/t/check12.sh
index 0f3928a35..9a63a43d6 100644
--- a/t/check12.sh
+++ b/t/check12.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/check2.sh b/t/check2.sh
index 2bf433dba..9fa183715 100644
--- a/t/check2.sh
+++ b/t/check2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/check4.sh b/t/check4.sh
index 8d0b1adfd..73e488322 100644
--- a/t/check4.sh
+++ b/t/check4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/check5.sh b/t/check5.sh
index c4e5b52f7..a793c83c4 100644
--- a/t/check5.sh
+++ b/t/check5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/check6.sh b/t/check6.sh
index 97aa153f0..870aed9a1 100644
--- a/t/check6.sh
+++ b/t/check6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/check7.sh b/t/check7.sh
index 313470289..bdf6fcc7d 100644
--- a/t/check7.sh
+++ b/t/check7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2017 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
diff --git a/t/check8.sh b/t/check8.sh
index c3929661d..cafcf4661 100644
--- a/t/check8.sh
+++ b/t/check8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/checkall.sh b/t/checkall.sh
index 9529e9f8e..8e2f54335 100644
--- a/t/checkall.sh
+++ b/t/checkall.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/clean.sh b/t/clean.sh
index d2eded2d8..4d27b911d 100644
--- a/t/clean.sh
+++ b/t/clean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/colneq.sh b/t/colneq.sh
index a0299ac91..bdef0ce5e 100644
--- a/t/colneq.sh
+++ b/t/colneq.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/colneq2.sh b/t/colneq2.sh
index e09f63b83..44408b4dd 100644
--- a/t/colneq2.sh
+++ b/t/colneq2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/colneq3.sh b/t/colneq3.sh
index f07af56e2..ced4ce3f9 100644
--- a/t/colneq3.sh
+++ b/t/colneq3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/colon.sh b/t/colon.sh
index b0d26d754..620a97384 100644
--- a/t/colon.sh
+++ b/t/colon.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/colon2.sh b/t/colon2.sh
index d43a4f9bd..17c9a418c 100644
--- a/t/colon2.sh
+++ b/t/colon2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/colon3.sh b/t/colon3.sh
index 684735e5e..fcad75284 100644
--- a/t/colon3.sh
+++ b/t/colon3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/colon4.sh b/t/colon4.sh
index 6b2707a53..f296346e0 100644
--- a/t/colon4.sh
+++ b/t/colon4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/colon5.sh b/t/colon5.sh
index 9742dac54..4ffa82009 100644
--- a/t/colon5.sh
+++ b/t/colon5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/colon6.sh b/t/colon6.sh
index cd73fc3c9..51d6819e4 100644
--- a/t/colon6.sh
+++ b/t/colon6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/colon7.sh b/t/colon7.sh
index 72a8f62b0..1adf681de 100644
--- a/t/colon7.sh
+++ b/t/colon7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/color-tests-opt.sh b/t/color-tests-opt.sh
index 9e1a97377..e930ae20e 100644
--- a/t/color-tests-opt.sh
+++ b/t/color-tests-opt.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2017 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
diff --git a/t/color-tests.sh b/t/color-tests.sh
index 0163a3106..34d41d39a 100644
--- a/t/color-tests.sh
+++ b/t/color-tests.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2017 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
diff --git a/t/color-tests2.sh b/t/color-tests2.sh
index a1f25d2a3..f24e18447 100644
--- a/t/color-tests2.sh
+++ b/t/color-tests2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2017 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
diff --git a/t/commen10.sh b/t/commen10.sh
index 948749110..205ba482d 100644
--- a/t/commen10.sh
+++ b/t/commen10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/commen11.sh b/t/commen11.sh
index 86300d77a..41a6a2766 100644
--- a/t/commen11.sh
+++ b/t/commen11.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/comment-block.sh b/t/comment-block.sh
index f98cedc20..34c46db22 100644
--- a/t/comment-block.sh
+++ b/t/comment-block.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/comment.sh b/t/comment.sh
index 3f9e892ff..412cc938f 100644
--- a/t/comment.sh
+++ b/t/comment.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/comment2.sh b/t/comment2.sh
index b5b860b05..129396efc 100644
--- a/t/comment2.sh
+++ b/t/comment2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/comment3.sh b/t/comment3.sh
index c36eefd93..3f0e02301 100644
--- a/t/comment3.sh
+++ b/t/comment3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/comment4.sh b/t/comment4.sh
index 998c881a1..cf7cc5ca8 100644
--- a/t/comment4.sh
+++ b/t/comment4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/comment5.sh b/t/comment5.sh
index af6df834f..bcc8218f7 100644
--- a/t/comment5.sh
+++ b/t/comment5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/comment6.sh b/t/comment6.sh
index 15128e28b..2593a2b6c 100644
--- a/t/comment6.sh
+++ b/t/comment6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/comment7.sh b/t/comment7.sh
index a354369f7..b7bd9989c 100644
--- a/t/comment7.sh
+++ b/t/comment7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/comment8.sh b/t/comment8.sh
index 10867c019..eac61b0ed 100644
--- a/t/comment8.sh
+++ b/t/comment8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/comment9.sh b/t/comment9.sh
index c3319f88d..72eff4e8d 100644
--- a/t/comment9.sh
+++ b/t/comment9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/comments-in-var-def.sh b/t/comments-in-var-def.sh
index 5ba8195bb..a8ec739b5 100644
--- a/t/comments-in-var-def.sh
+++ b/t/comments-in-var-def.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/compile.sh b/t/compile.sh
index 4b5588504..ec1026182 100644
--- a/t/compile.sh
+++ b/t/compile.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/compile2.sh b/t/compile2.sh
index 71263a4b6..49eab5e23 100644
--- a/t/compile2.sh
+++ b/t/compile2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/compile3.sh b/t/compile3.sh
index 9d7416f08..d87953fbf 100644
--- a/t/compile3.sh
+++ b/t/compile3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/compile4.sh b/t/compile4.sh
index f2f223f50..d8020d6b6 100644
--- a/t/compile4.sh
+++ b/t/compile4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/compile5.sh b/t/compile5.sh
index 4ca449bad..ada706ba0 100644
--- a/t/compile5.sh
+++ b/t/compile5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/compile6.sh b/t/compile6.sh
index d9dd92127..6bcaf22f8 100644
--- a/t/compile6.sh
+++ b/t/compile6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/compile7.sh b/t/compile7.sh
index 0dad8fb70..c6405d919 100644
--- a/t/compile7.sh
+++ b/t/compile7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/compile_f90_c_cxx.sh b/t/compile_f90_c_cxx.sh
index 256d1eb0d..b65ae9c51 100644
--- a/t/compile_f90_c_cxx.sh
+++ b/t/compile_f90_c_cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/compile_f_c_cxx.sh b/t/compile_f_c_cxx.sh
index 0d92d3351..7fd3b8e3c 100644
--- a/t/compile_f_c_cxx.sh
+++ b/t/compile_f_c_cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/cond-basic.sh b/t/cond-basic.sh
index fc4142f11..4b03769b7 100644
--- a/t/cond-basic.sh
+++ b/t/cond-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/cond.sh b/t/cond.sh
index 6eccd65c4..feb971acb 100644
--- a/t/cond.sh
+++ b/t/cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/cond10.sh b/t/cond10.sh
index 01a066109..5600c885d 100644
--- a/t/cond10.sh
+++ b/t/cond10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/cond11.sh b/t/cond11.sh
index fa55d8e06..921050209 100644
--- a/t/cond11.sh
+++ b/t/cond11.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/cond13.sh b/t/cond13.sh
index e2dff7329..02c31730e 100644
--- a/t/cond13.sh
+++ b/t/cond13.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/cond14.sh b/t/cond14.sh
index 867190bd1..8ff22f61d 100644
--- a/t/cond14.sh
+++ b/t/cond14.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/cond15.sh b/t/cond15.sh
index 67399e6db..3186700cb 100644
--- a/t/cond15.sh
+++ b/t/cond15.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/cond16.sh b/t/cond16.sh
index dc0e9082e..6d63deaa3 100644
--- a/t/cond16.sh
+++ b/t/cond16.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/cond17.sh b/t/cond17.sh
index 7353af6a0..5f325712b 100644
--- a/t/cond17.sh
+++ b/t/cond17.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/cond18.sh b/t/cond18.sh
index 7284e1e17..8a1b1d716 100644
--- a/t/cond18.sh
+++ b/t/cond18.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/cond19.sh b/t/cond19.sh
index 21279d5e2..feb3b2c32 100644
--- a/t/cond19.sh
+++ b/t/cond19.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/cond20.sh b/t/cond20.sh
index fa109b15c..395649512 100644
--- a/t/cond20.sh
+++ b/t/cond20.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/cond21.sh b/t/cond21.sh
index b0feda17f..94d76f825 100644
--- a/t/cond21.sh
+++ b/t/cond21.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/cond22.sh b/t/cond22.sh
index ae9ec80f4..fd8b88466 100644
--- a/t/cond22.sh
+++ b/t/cond22.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/cond23.sh b/t/cond23.sh
index b7ae5212b..7af89964f 100644
--- a/t/cond23.sh
+++ b/t/cond23.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/cond24.sh b/t/cond24.sh
index 6733e7b8b..9fc4abb70 100644
--- a/t/cond24.sh
+++ b/t/cond24.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/cond25.sh b/t/cond25.sh
index 41a9551fa..e654ce1c1 100644
--- a/t/cond25.sh
+++ b/t/cond25.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/cond26.sh b/t/cond26.sh
index 1770dfa58..01af6c4a5 100644
--- a/t/cond26.sh
+++ b/t/cond26.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/cond27.sh b/t/cond27.sh
index 0806ec068..b56973b06 100644
--- a/t/cond27.sh
+++ b/t/cond27.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/cond28.sh b/t/cond28.sh
index 2fe114081..1f492884d 100644
--- a/t/cond28.sh
+++ b/t/cond28.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/cond3.sh b/t/cond3.sh
index 80742fbb9..647bafa96 100644
--- a/t/cond3.sh
+++ b/t/cond3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/cond30.sh b/t/cond30.sh
index 0cd93d8dc..cd0d113c1 100644
--- a/t/cond30.sh
+++ b/t/cond30.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/cond31.sh b/t/cond31.sh
index ccfb38d8b..77ad9b57f 100644
--- a/t/cond31.sh
+++ b/t/cond31.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/cond32.sh b/t/cond32.sh
index f8a436eb5..2e92d6aca 100644
--- a/t/cond32.sh
+++ b/t/cond32.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/cond33.sh b/t/cond33.sh
index 627b0c8e5..99147d50c 100644
--- a/t/cond33.sh
+++ b/t/cond33.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/cond34.sh b/t/cond34.sh
index c49e8c617..224a10d52 100644
--- a/t/cond34.sh
+++ b/t/cond34.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/cond35.sh b/t/cond35.sh
index 34ee7e3a5..d6fffb29a 100644
--- a/t/cond35.sh
+++ b/t/cond35.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/cond36.sh b/t/cond36.sh
index 30b1e88dc..f913a087f 100644
--- a/t/cond36.sh
+++ b/t/cond36.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/cond37.sh b/t/cond37.sh
index e8e41eadb..2fe057e31 100644
--- a/t/cond37.sh
+++ b/t/cond37.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/cond38.sh b/t/cond38.sh
index fb08f8292..2b0bef2b6 100644
--- a/t/cond38.sh
+++ b/t/cond38.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/cond39.sh b/t/cond39.sh
index 65d377276..210c8377a 100644
--- a/t/cond39.sh
+++ b/t/cond39.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/cond4.sh b/t/cond4.sh
index 034e221d0..a40f66271 100644
--- a/t/cond4.sh
+++ b/t/cond4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/cond40.sh b/t/cond40.sh
index cd06003d1..a17c69935 100644
--- a/t/cond40.sh
+++ b/t/cond40.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/cond41.sh b/t/cond41.sh
index 059ec30a5..7cdc99299 100644
--- a/t/cond41.sh
+++ b/t/cond41.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/cond42.sh b/t/cond42.sh
index 289bf858e..c4c3b5de8 100644
--- a/t/cond42.sh
+++ b/t/cond42.sh
@@ -1,6 +1,6 @@
#!/bin/sh
nfig
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/cond43.sh b/t/cond43.sh
index 3b2c9acc3..c1e832d85 100644
--- a/t/cond43.sh
+++ b/t/cond43.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/cond44.sh b/t/cond44.sh
index b8c1defa0..b2afc612a 100644
--- a/t/cond44.sh
+++ b/t/cond44.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/cond45.sh b/t/cond45.sh
index 15ca718e3..d4adbe3fc 100644
--- a/t/cond45.sh
+++ b/t/cond45.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/cond46.sh b/t/cond46.sh
index b70a594bb..d221903c4 100644
--- a/t/cond46.sh
+++ b/t/cond46.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/cond5.sh b/t/cond5.sh
index eba0ef44b..2f3a4fa74 100644
--- a/t/cond5.sh
+++ b/t/cond5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/cond6.sh b/t/cond6.sh
index ee3a5df27..4a3ce2d48 100644
--- a/t/cond6.sh
+++ b/t/cond6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/cond7.sh b/t/cond7.sh
index ba9ae1ff8..9d0660402 100644
--- a/t/cond7.sh
+++ b/t/cond7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/cond8.sh b/t/cond8.sh
index 548210741..716294005 100644
--- a/t/cond8.sh
+++ b/t/cond8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/cond9.sh b/t/cond9.sh
index e9a361ca5..d9fd2dbb7 100644
--- a/t/cond9.sh
+++ b/t/cond9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/condd.sh b/t/condd.sh
index 8c680ab00..fe9d5e3ac 100644
--- a/t/condd.sh
+++ b/t/condd.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/condhook.sh b/t/condhook.sh
index 950e97148..3885db748 100644
--- a/t/condhook.sh
+++ b/t/condhook.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/condhook2.sh b/t/condhook2.sh
index a883e16be..e96da111c 100644
--- a/t/condhook2.sh
+++ b/t/condhook2.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/condinc.sh b/t/condinc.sh
index 84dc9cf3d..db73a3c6d 100644
--- a/t/condinc.sh
+++ b/t/condinc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/condinc2.sh b/t/condinc2.sh
index 87503e767..f92a57b95 100644
--- a/t/condinc2.sh
+++ b/t/condinc2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/condlib.sh b/t/condlib.sh
index 98db0814e..a1bfff1eb 100644
--- a/t/condlib.sh
+++ b/t/condlib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/condman2.sh b/t/condman2.sh
index 467481481..e06f63d04 100644
--- a/t/condman2.sh
+++ b/t/condman2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/condman3.sh b/t/condman3.sh
index 8041a619c..1be709569 100644
--- a/t/condman3.sh
+++ b/t/condman3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/confdeps.sh b/t/confdeps.sh
index 86a345e00..fbd1c770d 100644
--- a/t/confdeps.sh
+++ b/t/confdeps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/conff.sh b/t/conff.sh
index acfbf8b1f..d62b3eab8 100644
--- a/t/conff.sh
+++ b/t/conff.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/conff2.sh b/t/conff2.sh
index 089bcfe2c..c0b41eaa5 100644
--- a/t/conff2.sh
+++ b/t/conff2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/conffile-leading-dot.sh b/t/conffile-leading-dot.sh
index df3a3dd15..feb2e146b 100644
--- a/t/conffile-leading-dot.sh
+++ b/t/conffile-leading-dot.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/confh-subdir-clean.sh b/t/confh-subdir-clean.sh
index 8cb2685b0..7f28657d4 100644
--- a/t/confh-subdir-clean.sh
+++ b/t/confh-subdir-clean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/confh.sh b/t/confh.sh
index 85d21d4c3..4ab770d6d 100644
--- a/t/confh.sh
+++ b/t/confh.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/confh4.sh b/t/confh4.sh
index dc1a1d50c..0ec5ee474 100644
--- a/t/confh4.sh
+++ b/t/confh4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/confh5.sh b/t/confh5.sh
index aa4066f46..4065a6077 100644
--- a/t/confh5.sh
+++ b/t/confh5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/confh6.sh b/t/confh6.sh
index d83afc41f..37ed73ec9 100644
--- a/t/confh6.sh
+++ b/t/confh6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/confh7.sh b/t/confh7.sh
index cd8f7e400..ccb517fc6 100644
--- a/t/confh7.sh
+++ b/t/confh7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/confh8.sh b/t/confh8.sh
index da997099f..aa71b856d 100644
--- a/t/confh8.sh
+++ b/t/confh8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/confincl.sh b/t/confincl.sh
index d06ad8c60..ef52d599a 100644
--- a/t/confincl.sh
+++ b/t/confincl.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/conflnk.sh b/t/conflnk.sh
index fdfa58cf6..7b10417f8 100644
--- a/t/conflnk.sh
+++ b/t/conflnk.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/conflnk2.sh b/t/conflnk2.sh
index f376573ae..c9abb5948 100644
--- a/t/conflnk2.sh
+++ b/t/conflnk2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/conflnk3.sh b/t/conflnk3.sh
index 50f914a8e..254e610d1 100644
--- a/t/conflnk3.sh
+++ b/t/conflnk3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/conflnk4.sh b/t/conflnk4.sh
index e29b4599f..57c0de67f 100644
--- a/t/conflnk4.sh
+++ b/t/conflnk4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/confsub.sh b/t/confsub.sh
index f72e08871..dbf8b34d0 100644
--- a/t/confsub.sh
+++ b/t/confsub.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/confvar.sh b/t/confvar.sh
index 9984da715..dbc351e28 100644
--- a/t/confvar.sh
+++ b/t/confvar.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/confvar2.sh b/t/confvar2.sh
index 3869744c9..45b374b71 100644
--- a/t/confvar2.sh
+++ b/t/confvar2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/copy.sh b/t/copy.sh
index 9f8759789..a9437fb94 100644
--- a/t/copy.sh
+++ b/t/copy.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/cscope.tap b/t/cscope.tap
index 6886f0831..d6f80c9aa 100644
--- a/t/cscope.tap
+++ b/t/cscope.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/cscope2.sh b/t/cscope2.sh
index 8ad7b5d61..8cb618eb4 100644
--- a/t/cscope2.sh
+++ b/t/cscope2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/cscope3.sh b/t/cscope3.sh
index 119fbddc5..2edcad0d9 100644
--- a/t/cscope3.sh
+++ b/t/cscope3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/cxx-demo.sh b/t/cxx-demo.sh
index b1480a35d..1fb7e54eb 100644
--- a/t/cxx-demo.sh
+++ b/t/cxx-demo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/cxx-lt-demo.sh b/t/cxx-lt-demo.sh
index 9817ecbba..852cee76c 100644
--- a/t/cxx-lt-demo.sh
+++ b/t/cxx-lt-demo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/cxx.sh b/t/cxx.sh
index 12ed6ddf6..d31a3ad54 100644
--- a/t/cxx.sh
+++ b/t/cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/cxx2.sh b/t/cxx2.sh
index 55f48b5a7..c97f6d48e 100644
--- a/t/cxx2.sh
+++ b/t/cxx2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/cxxcpp.sh b/t/cxxcpp.sh
index 2cdd8b7c3..7de24f78f 100644
--- a/t/cxxcpp.sh
+++ b/t/cxxcpp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/cxxlibobj.sh b/t/cxxlibobj.sh
index f307f6d44..9714d67e7 100644
--- a/t/cxxlibobj.sh
+++ b/t/cxxlibobj.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/cxxlink.sh b/t/cxxlink.sh
index 45ae4f41d..b4ee5d8b5 100644
--- a/t/cxxlink.sh
+++ b/t/cxxlink.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/cxxnoc.sh b/t/cxxnoc.sh
index 14dfb92f7..df2e6fe5d 100644
--- a/t/cxxnoc.sh
+++ b/t/cxxnoc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/cygnus-no-more.sh b/t/cygnus-no-more.sh
index eef55b576..ab2860e84 100644
--- a/t/cygnus-no-more.sh
+++ b/t/cygnus-no-more.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/cygwin32.sh b/t/cygwin32.sh
index e0d72090a..2a144ab02 100644
--- a/t/cygwin32.sh
+++ b/t/cygwin32.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/dash.sh b/t/dash.sh
index eb7fb3fdd..5df5e6adc 100644
--- a/t/dash.sh
+++ b/t/dash.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/defun.sh b/t/defun.sh
index fdd773bc2..ae7517df9 100644
--- a/t/defun.sh
+++ b/t/defun.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/defun2.sh b/t/defun2.sh
index 67dd08718..b65c37005 100644
--- a/t/defun2.sh
+++ b/t/defun2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/dejagnu-absolute-builddir.sh b/t/dejagnu-absolute-builddir.sh
index d776d6a1d..0961b3035 100644
--- a/t/dejagnu-absolute-builddir.sh
+++ b/t/dejagnu-absolute-builddir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dejagnu-relative-srcdir.sh b/t/dejagnu-relative-srcdir.sh
index 6d259ae28..0e6cdf1f4 100644
--- a/t/dejagnu-relative-srcdir.sh
+++ b/t/dejagnu-relative-srcdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dejagnu-siteexp-append.sh b/t/dejagnu-siteexp-append.sh
index 43787ea1f..1af3774f9 100644
--- a/t/dejagnu-siteexp-append.sh
+++ b/t/dejagnu-siteexp-append.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dejagnu-siteexp-extend.sh b/t/dejagnu-siteexp-extend.sh
index 4a8daeca7..d111f3c47 100644
--- a/t/dejagnu-siteexp-extend.sh
+++ b/t/dejagnu-siteexp-extend.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dejagnu-siteexp-useredit.sh b/t/dejagnu-siteexp-useredit.sh
index d69cece6f..6f3a75f08 100644
--- a/t/dejagnu-siteexp-useredit.sh
+++ b/t/dejagnu-siteexp-useredit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dejagnu.sh b/t/dejagnu.sh
index 4e82f6d6b..563bae95f 100644
--- a/t/dejagnu.sh
+++ b/t/dejagnu.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/dejagnu2.sh b/t/dejagnu2.sh
index 28849a3f5..f4088b666 100644
--- a/t/dejagnu2.sh
+++ b/t/dejagnu2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/dejagnu3.sh b/t/dejagnu3.sh
index 5af74a9e5..e0413aecb 100644
--- a/t/dejagnu3.sh
+++ b/t/dejagnu3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/dejagnu4.sh b/t/dejagnu4.sh
index 27fb992a3..1ad535b1a 100644
--- a/t/dejagnu4.sh
+++ b/t/dejagnu4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/dejagnu5.sh b/t/dejagnu5.sh
index 268661e4c..6da93b607 100644
--- a/t/dejagnu5.sh
+++ b/t/dejagnu5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/dejagnu6.sh b/t/dejagnu6.sh
index c92f5f32d..459874a11 100644
--- a/t/dejagnu6.sh
+++ b/t/dejagnu6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/dejagnu7.sh b/t/dejagnu7.sh
index 3d51d8397..ea4a30165 100644
--- a/t/dejagnu7.sh
+++ b/t/dejagnu7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/deleted-am.sh b/t/deleted-am.sh
index 51f4218bd..afcb1de01 100644
--- a/t/deleted-am.sh
+++ b/t/deleted-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/deleted-m4.sh b/t/deleted-m4.sh
index 8d33982f6..a7b7e62a9 100644
--- a/t/deleted-m4.sh
+++ b/t/deleted-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/depacl2.sh b/t/depacl2.sh
index 43c2dab5f..56690f58b 100644
--- a/t/depacl2.sh
+++ b/t/depacl2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/depcomp-implicit-auxdir.sh b/t/depcomp-implicit-auxdir.sh
index 8b628f609..1281b19e6 100644
--- a/t/depcomp-implicit-auxdir.sh
+++ b/t/depcomp-implicit-auxdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/t/depcomp.sh b/t/depcomp.sh
index 4dc75bc78..5a5d5ba33 100644
--- a/t/depcomp.sh
+++ b/t/depcomp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/depcomp2.sh b/t/depcomp2.sh
index 780e49606..00c1f23fc 100644
--- a/t/depcomp2.sh
+++ b/t/depcomp2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/depcomp8a.sh b/t/depcomp8a.sh
index 2190800dc..65127a7da 100644
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh
index ba3a68388..52894cc91 100644
--- a/t/depcomp8b.sh
+++ b/t/depcomp8b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/depdist.sh b/t/depdist.sh
index 680d8dbf9..4a740c6b0 100644
--- a/t/depdist.sh
+++ b/t/depdist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/depend-postproc.sh b/t/depend-postproc.sh
index 1411783e0..9e20b057a 100644
--- a/t/depend-postproc.sh
+++ b/t/depend-postproc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/depend.sh b/t/depend.sh
index f8844d59a..4aa056b67 100644
--- a/t/depend.sh
+++ b/t/depend.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/depend3.sh b/t/depend3.sh
index 3bcb6d5db..1d6f3ed8b 100644
--- a/t/depend3.sh
+++ b/t/depend3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/depend4.sh b/t/depend4.sh
index 00dba8310..6e202357b 100644
--- a/t/depend4.sh
+++ b/t/depend4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/depend5.sh b/t/depend5.sh
index 5f4deb3b9..7400e6144 100644
--- a/t/depend5.sh
+++ b/t/depend5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/depend6.sh b/t/depend6.sh
index 5beeb61d6..0f3868530 100644
--- a/t/depend6.sh
+++ b/t/depend6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/deprecated-acinit.sh b/t/deprecated-acinit.sh
index 87a9e1694..45ec19e8f 100644
--- a/t/deprecated-acinit.sh
+++ b/t/deprecated-acinit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/destdir.sh b/t/destdir.sh
index dc9f229be..93c02a124 100644
--- a/t/destdir.sh
+++ b/t/destdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/dir-named-obj-is-bad.sh b/t/dir-named-obj-is-bad.sh
index 7eb1a20c5..c3e5a6c6c 100644
--- a/t/dir-named-obj-is-bad.sh
+++ b/t/dir-named-obj-is-bad.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/discover.sh b/t/discover.sh
index 0bb7a07c9..ab0866d2b 100644
--- a/t/discover.sh
+++ b/t/discover.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/dist-auxdir-many-subdirs.sh b/t/dist-auxdir-many-subdirs.sh
index cad8f5ac9..bf11a46d3 100644
--- a/t/dist-auxdir-many-subdirs.sh
+++ b/t/dist-auxdir-many-subdirs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dist-auxfile-2.sh b/t/dist-auxfile-2.sh
index 599fc8450..b977ee2a2 100644
--- a/t/dist-auxfile-2.sh
+++ b/t/dist-auxfile-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dist-auxfile.sh b/t/dist-auxfile.sh
index 6b54fcd59..fef805bd8 100644
--- a/t/dist-auxfile.sh
+++ b/t/dist-auxfile.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dist-formats.tap b/t/dist-formats.tap
index c5bb22f44..a32fa211a 100644
--- a/t/dist-formats.tap
+++ b/t/dist-formats.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/dist-included-parent-dir.sh b/t/dist-included-parent-dir.sh
index 3943b4ce8..b93cca06a 100644
--- a/t/dist-included-parent-dir.sh
+++ b/t/dist-included-parent-dir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/dist-install-sh.sh b/t/dist-install-sh.sh
index 9c07fdfc9..4d981527e 100644
--- a/t/dist-install-sh.sh
+++ b/t/dist-install-sh.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/dist-lzma.sh b/t/dist-lzma.sh
index ecbc6dc05..a18c3c720 100644
--- a/t/dist-lzma.sh
+++ b/t/dist-lzma.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/dist-missing-am.sh b/t/dist-missing-am.sh
index e0ffd1d2d..311de4bd4 100644
--- a/t/dist-missing-am.sh
+++ b/t/dist-missing-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dist-missing-included-m4.sh b/t/dist-missing-included-m4.sh
index 8804c42ae..4d2552311 100644
--- a/t/dist-missing-included-m4.sh
+++ b/t/dist-missing-included-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dist-missing-m4.sh b/t/dist-missing-m4.sh
index 2ead2fc77..f54e14add 100644
--- a/t/dist-missing-m4.sh
+++ b/t/dist-missing-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dist-pr109765.sh b/t/dist-pr109765.sh
index 55dd35c27..abdb47e78 100644
--- a/t/dist-pr109765.sh
+++ b/t/dist-pr109765.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/dist-readonly.sh b/t/dist-readonly.sh
index a8bc8f017..9b9faa891 100644
--- a/t/dist-readonly.sh
+++ b/t/dist-readonly.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dist-repeated.sh b/t/dist-repeated.sh
index fcff7d847..18e4271cf 100644
--- a/t/dist-repeated.sh
+++ b/t/dist-repeated.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dist-shar.sh b/t/dist-shar.sh
index 04a13d8d7..f878cf1fd 100644
--- a/t/dist-shar.sh
+++ b/t/dist-shar.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/dist-tarZ.sh b/t/dist-tarZ.sh
index de0e27752..98fecd2ee 100644
--- a/t/dist-tarZ.sh
+++ b/t/dist-tarZ.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/dist-with-unreadable-makefile-fails.sh b/t/dist-with-unreadable-makefile-fails.sh
index 5057f1773..269b8ca72 100644
--- a/t/dist-with-unreadable-makefile-fails.sh
+++ b/t/dist-with-unreadable-makefile-fails.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/distcheck-Tpo.sh b/t/distcheck-Tpo.sh
index 9d7900cb4..28285ce41 100644
--- a/t/distcheck-Tpo.sh
+++ b/t/distcheck-Tpo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2016 Free Software Foundation, Inc.
+# Copyright (C) 2016-2017 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
diff --git a/t/distcheck-configure-flags-am.sh b/t/distcheck-configure-flags-am.sh
index e3f4bd800..df825e4bf 100644
--- a/t/distcheck-configure-flags-am.sh
+++ b/t/distcheck-configure-flags-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/distcheck-configure-flags-subpkg.sh b/t/distcheck-configure-flags-subpkg.sh
index b9ff22231..64b34b9aa 100644
--- a/t/distcheck-configure-flags-subpkg.sh
+++ b/t/distcheck-configure-flags-subpkg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/distcheck-configure-flags.sh b/t/distcheck-configure-flags.sh
index fe7993333..809189507 100644
--- a/t/distcheck-configure-flags.sh
+++ b/t/distcheck-configure-flags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/distcheck-hook.sh b/t/distcheck-hook.sh
index 0152b4340..f519088a0 100644
--- a/t/distcheck-hook.sh
+++ b/t/distcheck-hook.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/distcheck-hook2.sh b/t/distcheck-hook2.sh
index 45037f506..e060af07d 100644
--- a/t/distcheck-hook2.sh
+++ b/t/distcheck-hook2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/distcheck-missing-m4.sh b/t/distcheck-missing-m4.sh
index 969623ade..ad1a24786 100644
--- a/t/distcheck-missing-m4.sh
+++ b/t/distcheck-missing-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/distcheck-no-prefix-or-srcdir-override.sh b/t/distcheck-no-prefix-or-srcdir-override.sh
index bef334b23..c99a7d98b 100644
--- a/t/distcheck-no-prefix-or-srcdir-override.sh
+++ b/t/distcheck-no-prefix-or-srcdir-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/distcheck-outdated-m4.sh b/t/distcheck-outdated-m4.sh
index f237c6116..12591ce4f 100644
--- a/t/distcheck-outdated-m4.sh
+++ b/t/distcheck-outdated-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/distcheck-override-infodir.sh b/t/distcheck-override-infodir.sh
index 5db6f6ecb..efe5a9405 100644
--- a/t/distcheck-override-infodir.sh
+++ b/t/distcheck-override-infodir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/distcheck-pr10470.sh b/t/distcheck-pr10470.sh
index 69a638db2..5424d029f 100644
--- a/t/distcheck-pr10470.sh
+++ b/t/distcheck-pr10470.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/distcheck-pr18286.sh b/t/distcheck-pr18286.sh
index 85755431a..549ec22b7 100644
--- a/t/distcheck-pr18286.sh
+++ b/t/distcheck-pr18286.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2014-2015 Free Software Foundation, Inc.
+# Copyright (C) 2014-2017 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
diff --git a/t/distcheck-pr9579.sh b/t/distcheck-pr9579.sh
index 0d78f206b..2034f170d 100644
--- a/t/distcheck-pr9579.sh
+++ b/t/distcheck-pr9579.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/distcheck-writable-srcdir.sh b/t/distcheck-writable-srcdir.sh
index 4215fd934..523433738 100644
--- a/t/distcheck-writable-srcdir.sh
+++ b/t/distcheck-writable-srcdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/distcleancheck.sh b/t/distcleancheck.sh
index 702de78d1..ed92e7795 100644
--- a/t/distcleancheck.sh
+++ b/t/distcleancheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/distcom-subdir.sh b/t/distcom-subdir.sh
index 0c3f9ccc3..999400b24 100644
--- a/t/distcom-subdir.sh
+++ b/t/distcom-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/distcom2.sh b/t/distcom2.sh
index e7816de86..47895a919 100644
--- a/t/distcom2.sh
+++ b/t/distcom2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/distcom3.sh b/t/distcom3.sh
index 2b1cccd12..d4bc89516 100644
--- a/t/distcom3.sh
+++ b/t/distcom3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/distcom4.sh b/t/distcom4.sh
index 012c6aa5b..4c3fbeecd 100644
--- a/t/distcom4.sh
+++ b/t/distcom4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/distcom5.sh b/t/distcom5.sh
index 7a2944c6b..6885c1758 100644
--- a/t/distcom5.sh
+++ b/t/distcom5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/distdir.sh b/t/distdir.sh
index 3532b5e21..e1f8c411c 100644
--- a/t/distdir.sh
+++ b/t/distdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/disthook.sh b/t/disthook.sh
index d1b07adb4..0c2cfdb25 100644
--- a/t/disthook.sh
+++ b/t/disthook.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/distlinks.sh b/t/distlinks.sh
index c0e9eb678..c87622837 100644
--- a/t/distlinks.sh
+++ b/t/distlinks.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/distlinksbrk.sh b/t/distlinksbrk.sh
index 4eddb9a78..39604e0ad 100644
--- a/t/distlinksbrk.sh
+++ b/t/distlinksbrk.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/distname.sh b/t/distname.sh
index 7436c2d41..503e78208 100644
--- a/t/distname.sh
+++ b/t/distname.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/dmalloc.sh b/t/dmalloc.sh
index 00b0483bb..ea7854de8 100644
--- a/t/dmalloc.sh
+++ b/t/dmalloc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/doc-parsing-buglets-colneq-subst.sh b/t/doc-parsing-buglets-colneq-subst.sh
index e27b9ad48..5d2dbb360 100644
--- a/t/doc-parsing-buglets-colneq-subst.sh
+++ b/t/doc-parsing-buglets-colneq-subst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/doc-parsing-buglets-tabs.sh b/t/doc-parsing-buglets-tabs.sh
index 23b80f26e..190c9a95a 100644
--- a/t/doc-parsing-buglets-tabs.sh
+++ b/t/doc-parsing-buglets-tabs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/dollar.sh b/t/dollar.sh
index 07c20e1d4..5910ad055 100644
--- a/t/dollar.sh
+++ b/t/dollar.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/dollarvar.sh b/t/dollarvar.sh
index 1ffa1e221..720818b35 100644
--- a/t/dollarvar.sh
+++ b/t/dollarvar.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/dollarvar2.sh b/t/dollarvar2.sh
index 99059a230..80b03190b 100644
--- a/t/dollarvar2.sh
+++ b/t/dollarvar2.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/double.sh b/t/double.sh
index b22e7b5c2..9b00e9e5d 100644
--- a/t/double.sh
+++ b/t/double.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/dup2.sh b/t/dup2.sh
index 1171b0e7d..537313028 100644
--- a/t/dup2.sh
+++ b/t/dup2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/else.sh b/t/else.sh
index 6f429a1be..4bf755d62 100644
--- a/t/else.sh
+++ b/t/else.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/empty-data-primary.sh b/t/empty-data-primary.sh
index df6656c76..c80fa0f2a 100644
--- a/t/empty-data-primary.sh
+++ b/t/empty-data-primary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/empty-sources-primary.tap b/t/empty-sources-primary.tap
index 1be9b5243..36a20dd25 100644
--- a/t/empty-sources-primary.tap
+++ b/t/empty-sources-primary.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/exdir.sh b/t/exdir.sh
index cf0f4d321..d34701dfd 100644
--- a/t/exdir.sh
+++ b/t/exdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/exdir2.sh b/t/exdir2.sh
index 12c636703..84ec535c6 100644
--- a/t/exdir2.sh
+++ b/t/exdir2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/exdir3.sh b/t/exdir3.sh
index c79dc92a0..10accc04a 100644
--- a/t/exdir3.sh
+++ b/t/exdir3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2017 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
diff --git a/t/exeext.sh b/t/exeext.sh
index fef99ba6e..2df3b021b 100644
--- a/t/exeext.sh
+++ b/t/exeext.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/exeext2.sh b/t/exeext2.sh
index 86c607471..82700ac28 100644
--- a/t/exeext2.sh
+++ b/t/exeext2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/exeext3.sh b/t/exeext3.sh
index 635bc5313..7a5d0e63c 100644
--- a/t/exeext3.sh
+++ b/t/exeext3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/exeext4.sh b/t/exeext4.sh
index 8812d5e91..b3c1774fe 100644
--- a/t/exeext4.sh
+++ b/t/exeext4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/ext.sh b/t/ext.sh
index e64dee3f9..0b2435aab 100644
--- a/t/ext.sh
+++ b/t/ext.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/ext2.sh b/t/ext2.sh
index 84023dfdb..6e6580750 100644
--- a/t/ext2.sh
+++ b/t/ext2.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/ext3.sh b/t/ext3.sh
index 0d0298d7a..bfce9e6cf 100644
--- a/t/ext3.sh
+++ b/t/ext3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/extra-data.sh b/t/extra-data.sh
index fdf376397..b6614af43 100644
--- a/t/extra-data.sh
+++ b/t/extra-data.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/extra-deps-lt.sh b/t/extra-deps-lt.sh
index 6ce4f4d3c..8f777366e 100644
--- a/t/extra-deps-lt.sh
+++ b/t/extra-deps-lt.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/extra-deps.sh b/t/extra-deps.sh
index c3f649178..79a7a55ab 100644
--- a/t/extra-deps.sh
+++ b/t/extra-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/extra-dist-dirs-and-subdirs.sh b/t/extra-dist-dirs-and-subdirs.sh
index e9955460b..d01007808 100644
--- a/t/extra-dist-dirs-and-subdirs.sh
+++ b/t/extra-dist-dirs-and-subdirs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/extra-dist-vpath-dir-merge.sh b/t/extra-dist-vpath-dir-merge.sh
index 149770c4c..e0a2cc7bd 100644
--- a/t/extra-dist-vpath-dir-merge.sh
+++ b/t/extra-dist-vpath-dir-merge.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/extra-dist-vpath-dir.sh b/t/extra-dist-vpath-dir.sh
index 1f6c9eea8..cfea384bb 100644
--- a/t/extra-dist-vpath-dir.sh
+++ b/t/extra-dist-vpath-dir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/extra-dist-wildcards-gnu.sh b/t/extra-dist-wildcards-gnu.sh
index f6ea49a4b..12bb2f699 100644
--- a/t/extra-dist-wildcards-gnu.sh
+++ b/t/extra-dist-wildcards-gnu.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/extra-dist-wildcards-vpath.sh b/t/extra-dist-wildcards-vpath.sh
index 6762620ea..d1be5df31 100644
--- a/t/extra-dist-wildcards-vpath.sh
+++ b/t/extra-dist-wildcards-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/extra-dist-wildcards.sh b/t/extra-dist-wildcards.sh
index d7bb7ce5a..f00a25f9b 100644
--- a/t/extra-dist-wildcards.sh
+++ b/t/extra-dist-wildcards.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/extra-portability.sh b/t/extra-portability.sh
index 04946e01c..3e04f5f45 100644
--- a/t/extra-portability.sh
+++ b/t/extra-portability.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/extra-portability2.sh b/t/extra-portability2.sh
index 2aac06a2c..edcabf82b 100644
--- a/t/extra-portability2.sh
+++ b/t/extra-portability2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/extra-portability3.sh b/t/extra-portability3.sh
index df0e016f1..77680c663 100644
--- a/t/extra-portability3.sh
+++ b/t/extra-portability3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/extra-programs-and-libs.sh b/t/extra-programs-and-libs.sh
index ff2ce46a6..fe402a230 100644
--- a/t/extra-programs-and-libs.sh
+++ b/t/extra-programs-and-libs.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/extra-programs-empty.sh b/t/extra-programs-empty.sh
index 597135cb6..9220ff718 100644
--- a/t/extra-programs-empty.sh
+++ b/t/extra-programs-empty.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/extra-programs-misc.sh b/t/extra-programs-misc.sh
index 557c2a8c8..ca51a8751 100644
--- a/t/extra-programs-misc.sh
+++ b/t/extra-programs-misc.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/extra-sources-no-spurious.sh b/t/extra-sources-no-spurious.sh
index da0471ce2..ccc15c631 100644
--- a/t/extra-sources-no-spurious.sh
+++ b/t/extra-sources-no-spurious.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/extra-sources.sh b/t/extra-sources.sh
index cbffc9080..51e5e55a1 100644
--- a/t/extra-sources.sh
+++ b/t/extra-sources.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/extra.sh b/t/extra.sh
index 7518f57e7..28dbf0003 100644
--- a/t/extra.sh
+++ b/t/extra.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/f90only.sh b/t/f90only.sh
index 70517c2d6..73687f478 100644
--- a/t/f90only.sh
+++ b/t/f90only.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/flavor.sh b/t/flavor.sh
index 748c47266..2222d1acc 100644
--- a/t/flavor.sh
+++ b/t/flavor.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/flibs.sh b/t/flibs.sh
index 2cdbf3189..856931b88 100644
--- a/t/flibs.sh
+++ b/t/flibs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/fn99.sh b/t/fn99.sh
index 8d3219140..15db5825e 100644
--- a/t/fn99.sh
+++ b/t/fn99.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/fn99subdir.sh b/t/fn99subdir.sh
index 10f6fa055..5754dcd6f 100644
--- a/t/fn99subdir.sh
+++ b/t/fn99subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/fnoc.sh b/t/fnoc.sh
index 62651d2c4..7d6f515d0 100644
--- a/t/fnoc.sh
+++ b/t/fnoc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/fonly.sh b/t/fonly.sh
index 08c7ec8ad..2877f3ae9 100644
--- a/t/fonly.sh
+++ b/t/fonly.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/forcemiss.sh b/t/forcemiss.sh
index c0ca35489..d4c9c8ff2 100644
--- a/t/forcemiss.sh
+++ b/t/forcemiss.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/t/forcemiss2.sh b/t/forcemiss2.sh
index ee2148753..031a3cb58 100644
--- a/t/forcemiss2.sh
+++ b/t/forcemiss2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/t/fort1.sh b/t/fort1.sh
index 38b258a58..ca45bdfdd 100644
--- a/t/fort1.sh
+++ b/t/fort1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/fort2.sh b/t/fort2.sh
index 1d5bf97a1..cc17aaefa 100644
--- a/t/fort2.sh
+++ b/t/fort2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/fort4.sh b/t/fort4.sh
index be6a4f31a..f850c8e0e 100644
--- a/t/fort4.sh
+++ b/t/fort4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/fort5.sh b/t/fort5.sh
index 9826699ad..44cbb20fb 100644
--- a/t/fort5.sh
+++ b/t/fort5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/fortdep.sh b/t/fortdep.sh
index 8b3adc022..2574a3f88 100644
--- a/t/fortdep.sh
+++ b/t/fortdep.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/t/gcj.sh b/t/gcj.sh
index 626ca1186..20f4f015b 100644
--- a/t/gcj.sh
+++ b/t/gcj.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/gcj2.sh b/t/gcj2.sh
index 15b8a76ca..ab4ca67ba 100644
--- a/t/gcj2.sh
+++ b/t/gcj2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/gcj3.sh b/t/gcj3.sh
index c99ad0ad0..24a1d20e2 100644
--- a/t/gcj3.sh
+++ b/t/gcj3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/gcj4.sh b/t/gcj4.sh
index 2231260c9..feb1547cb 100644
--- a/t/gcj4.sh
+++ b/t/gcj4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/gcj5.sh b/t/gcj5.sh
index b65e083f3..4a1d40ca4 100644
--- a/t/gcj5.sh
+++ b/t/gcj5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/gcj6.sh b/t/gcj6.sh
index 3dbf43d9b..b0d01ba23 100644
--- a/t/gcj6.sh
+++ b/t/gcj6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/get-sysconf.sh b/t/get-sysconf.sh
index 35ff0edba..986c1dd36 100644
--- a/t/get-sysconf.sh
+++ b/t/get-sysconf.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/gettext-basics.sh b/t/gettext-basics.sh
index 684f83c76..7ba1667a5 100644
--- a/t/gettext-basics.sh
+++ b/t/gettext-basics.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/gettext-config-rpath.sh b/t/gettext-config-rpath.sh
index b9903ec62..aaedd61a6 100644
--- a/t/gettext-config-rpath.sh
+++ b/t/gettext-config-rpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/gettext-external-pr338.sh b/t/gettext-external-pr338.sh
index 61b40e86c..b4912eb5d 100644
--- a/t/gettext-external-pr338.sh
+++ b/t/gettext-external-pr338.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/gettext-intl-subdir.sh b/t/gettext-intl-subdir.sh
index bb9463e3f..e55fffc12 100644
--- a/t/gettext-intl-subdir.sh
+++ b/t/gettext-intl-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
index d78ade6eb..34f4e9c0e 100644
--- a/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/gettext-pr381.sh b/t/gettext-pr381.sh
index 9624292cf..a76d751f3 100644
--- a/t/gettext-pr381.sh
+++ b/t/gettext-pr381.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/gnits.sh b/t/gnits.sh
index 3becd21c1..fb1e8217b 100644
--- a/t/gnits.sh
+++ b/t/gnits.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/gnits2.sh b/t/gnits2.sh
index 593086a6c..c6a30ab0e 100644
--- a/t/gnits2.sh
+++ b/t/gnits2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/gnits3.sh b/t/gnits3.sh
index 2b4839e82..a9748c7a3 100644
--- a/t/gnits3.sh
+++ b/t/gnits3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/gnumake.sh b/t/gnumake.sh
index 5f69746c3..b5502cc45 100644
--- a/t/gnumake.sh
+++ b/t/gnumake.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/gnuwarn.sh b/t/gnuwarn.sh
index 73dd8ebf8..fbea36d3a 100644
--- a/t/gnuwarn.sh
+++ b/t/gnuwarn.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/gnuwarn2.sh b/t/gnuwarn2.sh
index d98646774..ebf6c09e7 100644
--- a/t/gnuwarn2.sh
+++ b/t/gnuwarn2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/hdr-vars-defined-once.sh b/t/hdr-vars-defined-once.sh
index 926d6bd58..9f669033e 100644
--- a/t/hdr-vars-defined-once.sh
+++ b/t/hdr-vars-defined-once.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/header.sh b/t/header.sh
index afe11f9cf..161d3acf9 100644
--- a/t/header.sh
+++ b/t/header.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/t/help-depend.sh b/t/help-depend.sh
index 056fdea56..cc49fb08d 100644
--- a/t/help-depend.sh
+++ b/t/help-depend.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/help-depend2.sh b/t/help-depend2.sh
index 1d4874cdd..60f64ca6e 100644
--- a/t/help-depend2.sh
+++ b/t/help-depend2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/help-dmalloc.sh b/t/help-dmalloc.sh
index b48e8249c..430a733de 100644
--- a/t/help-dmalloc.sh
+++ b/t/help-dmalloc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/help-init.sh b/t/help-init.sh
index e30a50f79..e20674aad 100644
--- a/t/help-init.sh
+++ b/t/help-init.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/help-lispdir.sh b/t/help-lispdir.sh
index 4d81b869c..9b9fdbc5f 100644
--- a/t/help-lispdir.sh
+++ b/t/help-lispdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/help-python.sh b/t/help-python.sh
index 3fc1385a2..643908128 100644
--- a/t/help-python.sh
+++ b/t/help-python.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/help-silent.sh b/t/help-silent.sh
index 3dc3394a1..0725fad66 100644
--- a/t/help-silent.sh
+++ b/t/help-silent.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/help-upc.sh b/t/help-upc.sh
index 8e22b1ae9..ed6678e77 100644
--- a/t/help-upc.sh
+++ b/t/help-upc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/help.sh b/t/help.sh
index 5e9282e77..7525b2602 100644
--- a/t/help.sh
+++ b/t/help.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/help2.sh b/t/help2.sh
index 64aa7d2bb..4618f3aff 100644
--- a/t/help2.sh
+++ b/t/help2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/help3.sh b/t/help3.sh
index 0a33e4f47..738aba8c0 100644
--- a/t/help3.sh
+++ b/t/help3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/help4.sh b/t/help4.sh
index 4c675e42f..61bbd448a 100644
--- a/t/help4.sh
+++ b/t/help4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/hfs.sh b/t/hfs.sh
index aa252023a..c29d4d9d3 100644
--- a/t/hfs.sh
+++ b/t/hfs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/implicit.sh b/t/implicit.sh
index 324878b1d..a49b54e3a 100644
--- a/t/implicit.sh
+++ b/t/implicit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/includes-deprecation.sh b/t/includes-deprecation.sh
index a771d0772..169a0a978 100644
--- a/t/includes-deprecation.sh
+++ b/t/includes-deprecation.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/init.sh b/t/init.sh
index 71b019405..25057f53d 100644
--- a/t/init.sh
+++ b/t/init.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/init2.sh b/t/init2.sh
index 7fc86882d..3e30e1b2c 100644
--- a/t/init2.sh
+++ b/t/init2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/install-info-dir.sh b/t/install-info-dir.sh
index 991e065d5..ef3be1b48 100644
--- a/t/install-info-dir.sh
+++ b/t/install-info-dir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/install-sh-option-C.sh b/t/install-sh-option-C.sh
index 08572b7a4..12880c0ad 100644
--- a/t/install-sh-option-C.sh
+++ b/t/install-sh-option-C.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/install-sh-unittests.sh b/t/install-sh-unittests.sh
index e6155eeeb..17188e878 100644
--- a/t/install-sh-unittests.sh
+++ b/t/install-sh-unittests.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/installdir.sh b/t/installdir.sh
index da8055af4..cf8ab0bce 100644
--- a/t/installdir.sh
+++ b/t/installdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/instdat.sh b/t/instdat.sh
index b39e2f963..53a959b96 100644
--- a/t/instdat.sh
+++ b/t/instdat.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/instdat2.sh b/t/instdat2.sh
index d1ff0a645..97862758c 100644
--- a/t/instdat2.sh
+++ b/t/instdat2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/instdir-cond.sh b/t/instdir-cond.sh
index e821ddc56..fc6e3b700 100644
--- a/t/instdir-cond.sh
+++ b/t/instdir-cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/instdir-cond2.sh b/t/instdir-cond2.sh
index 86209510b..a3f09adcb 100644
--- a/t/instdir-cond2.sh
+++ b/t/instdir-cond2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/instdir-java.sh b/t/instdir-java.sh
index b77b93619..37a2c2221 100644
--- a/t/instdir-java.sh
+++ b/t/instdir-java.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/instdir-lisp.sh b/t/instdir-lisp.sh
index 340c359fa..0cee035ad 100644
--- a/t/instdir-lisp.sh
+++ b/t/instdir-lisp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh
index bc27b13f4..91a27ee8d 100644
--- a/t/instdir-ltlib.sh
+++ b/t/instdir-ltlib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/instdir-no-empty.sh b/t/instdir-no-empty.sh
index b0483343f..0474070e8 100644
--- a/t/instdir-no-empty.sh
+++ b/t/instdir-no-empty.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh
index a3ce8ca11..5c6db0f24 100644
--- a/t/instdir-prog.sh
+++ b/t/instdir-prog.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/instdir-python.sh b/t/instdir-python.sh
index 49dab852d..857937e72 100644
--- a/t/instdir-python.sh
+++ b/t/instdir-python.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/instdir-texi.sh b/t/instdir-texi.sh
index 6bd53602d..3382cbd1d 100644
--- a/t/instdir-texi.sh
+++ b/t/instdir-texi.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/instdir.sh b/t/instdir.sh
index 89e329de1..786e5d866 100644
--- a/t/instdir.sh
+++ b/t/instdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/instdir2.sh b/t/instdir2.sh
index 3a88635b7..0c3acf253 100644
--- a/t/instdir2.sh
+++ b/t/instdir2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/instexec.sh b/t/instexec.sh
index d64a5613a..9fbfe535f 100644
--- a/t/instexec.sh
+++ b/t/instexec.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/instfail-info.sh b/t/instfail-info.sh
index d4002890c..efea06335 100644
--- a/t/instfail-info.sh
+++ b/t/instfail-info.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/instfail-java.sh b/t/instfail-java.sh
index 1f8ca0bfa..55b9912cd 100644
--- a/t/instfail-java.sh
+++ b/t/instfail-java.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/instfail-libtool.sh b/t/instfail-libtool.sh
index a879184f4..9e48c53fd 100644
--- a/t/instfail-libtool.sh
+++ b/t/instfail-libtool.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/instfail.sh b/t/instfail.sh
index 02168ca19..99ea0632e 100644
--- a/t/instfail.sh
+++ b/t/instfail.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/insthook.sh b/t/insthook.sh
index 46f39b0aa..69a050237 100644
--- a/t/insthook.sh
+++ b/t/insthook.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/instman.sh b/t/instman.sh
index e09fdb072..ed0f71d52 100644
--- a/t/instman.sh
+++ b/t/instman.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/instman2.sh b/t/instman2.sh
index 5b1dc6aae..2807c77a4 100644
--- a/t/instman2.sh
+++ b/t/instman2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/t/instmany-mans.sh b/t/instmany-mans.sh
index 1d5a068ce..ae16f95f4 100644
--- a/t/instmany-mans.sh
+++ b/t/instmany-mans.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/instmany-python.sh b/t/instmany-python.sh
index 4707fa027..2fa5262e8 100644
--- a/t/instmany-python.sh
+++ b/t/instmany-python.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/instmany.sh b/t/instmany.sh
index fea3a765c..6a6cacb10 100644
--- a/t/instmany.sh
+++ b/t/instmany.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/instspc.tap b/t/instspc.tap
index 23c91d2ed..fa07163df 100644
--- a/t/instspc.tap
+++ b/t/instspc.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/interp.sh b/t/interp.sh
index e98261587..1af6f4616 100644
--- a/t/interp.sh
+++ b/t/interp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/interp2.sh b/t/interp2.sh
index 1b45aae97..94d84e076 100644
--- a/t/interp2.sh
+++ b/t/interp2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/java-check.sh b/t/java-check.sh
index 4862a16c6..83c93a9d8 100644
--- a/t/java-check.sh
+++ b/t/java-check.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/java-clean.sh b/t/java-clean.sh
index 870a2bc23..eaa54510f 100644
--- a/t/java-clean.sh
+++ b/t/java-clean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/java-compile-install.sh b/t/java-compile-install.sh
index ff2dd3f70..8b5416d70 100644
--- a/t/java-compile-install.sh
+++ b/t/java-compile-install.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/java-compile-run-flat.sh b/t/java-compile-run-flat.sh
index 4b42f632b..4a7099a98 100644
--- a/t/java-compile-run-flat.sh
+++ b/t/java-compile-run-flat.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/java-compile-run-nested.sh b/t/java-compile-run-nested.sh
index e9d4039cb..20e3f8777 100644
--- a/t/java-compile-run-nested.sh
+++ b/t/java-compile-run-nested.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/java-empty-classpath.sh b/t/java-empty-classpath.sh
index 4a242e200..a213eaa68 100644
--- a/t/java-empty-classpath.sh
+++ b/t/java-empty-classpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/java-extra.sh b/t/java-extra.sh
index d19fd3c76..a749dd8b8 100644
--- a/t/java-extra.sh
+++ b/t/java-extra.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/java-mix.sh b/t/java-mix.sh
index 2e2b2d0f2..e3cf463e1 100644
--- a/t/java-mix.sh
+++ b/t/java-mix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/java-no-duplicate.sh b/t/java-no-duplicate.sh
index fdc20512d..5121ae698 100644
--- a/t/java-no-duplicate.sh
+++ b/t/java-no-duplicate.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/java-nobase.sh b/t/java-nobase.sh
index a26c1204e..1c720bf78 100644
--- a/t/java-nobase.sh
+++ b/t/java-nobase.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/java-noinst.sh b/t/java-noinst.sh
index ba9b2a6e0..911d83126 100644
--- a/t/java-noinst.sh
+++ b/t/java-noinst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/java-rebuild.sh b/t/java-rebuild.sh
index e9523dec6..2567cf0f5 100644
--- a/t/java-rebuild.sh
+++ b/t/java-rebuild.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/java-sources.sh b/t/java-sources.sh
index 42c3157b4..5d376bceb 100644
--- a/t/java-sources.sh
+++ b/t/java-sources.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/java-uninstall.sh b/t/java-uninstall.sh
index cc0d53af3..c38072276 100644
--- a/t/java-uninstall.sh
+++ b/t/java-uninstall.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/java.sh b/t/java.sh
index b1ab385cc..f35bed292 100644
--- a/t/java.sh
+++ b/t/java.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/java2.sh b/t/java2.sh
index 774ba2f29..9c80e7957 100644
--- a/t/java2.sh
+++ b/t/java2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/java3.sh b/t/java3.sh
index ee1d0c5f2..88cca6567 100644
--- a/t/java3.sh
+++ b/t/java3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/javadir-undefined.sh b/t/javadir-undefined.sh
index 27ebec6ac..af919e47c 100644
--- a/t/javadir-undefined.sh
+++ b/t/javadir-undefined.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/javaflags.sh b/t/javaflags.sh
index 64d5d5de0..a10c3b920 100644
--- a/t/javaflags.sh
+++ b/t/javaflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/javaprim.sh b/t/javaprim.sh
index 288f4b511..939703800 100644
--- a/t/javaprim.sh
+++ b/t/javaprim.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/javasubst.sh b/t/javasubst.sh
index 8ad014870..5962b0066 100644
--- a/t/javasubst.sh
+++ b/t/javasubst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/ldadd.sh b/t/ldadd.sh
index 42dfd7fd5..66e3c6c6c 100644
--- a/t/ldadd.sh
+++ b/t/ldadd.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/ldflags.sh b/t/ldflags.sh
index 1d5dbfd07..10a282daf 100644
--- a/t/ldflags.sh
+++ b/t/ldflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/t/lex-clean-cxx.sh b/t/lex-clean-cxx.sh
index 0d9cbf475..2c90b18f2 100644
--- a/t/lex-clean-cxx.sh
+++ b/t/lex-clean-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/lex-clean.sh b/t/lex-clean.sh
index 632fb9e8d..376b323e3 100644
--- a/t/lex-clean.sh
+++ b/t/lex-clean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/lex-depend-cxx.sh b/t/lex-depend-cxx.sh
index 79a2f3b77..a20890872 100644
--- a/t/lex-depend-cxx.sh
+++ b/t/lex-depend-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/lex-depend-grep.sh b/t/lex-depend-grep.sh
index 70e5cb8d2..81e61bae8 100644
--- a/t/lex-depend-grep.sh
+++ b/t/lex-depend-grep.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/lex-depend.sh b/t/lex-depend.sh
index 9ef976882..587b6bec4 100644
--- a/t/lex-depend.sh
+++ b/t/lex-depend.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/lex-header.sh b/t/lex-header.sh
index 614f656d1..01495ddc7 100644
--- a/t/lex-header.sh
+++ b/t/lex-header.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/lex-lib-external.sh b/t/lex-lib-external.sh
index c02fbb146..a83fbb5c8 100644
--- a/t/lex-lib-external.sh
+++ b/t/lex-lib-external.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/lex-lib.sh b/t/lex-lib.sh
index c95330d64..e0f845b3f 100644
--- a/t/lex-lib.sh
+++ b/t/lex-lib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/lex-libobj.sh b/t/lex-libobj.sh
index 0d994b173..631080a56 100644
--- a/t/lex-libobj.sh
+++ b/t/lex-libobj.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/lex-line.sh b/t/lex-line.sh
index df822030f..8b85dd26d 100644
--- a/t/lex-line.sh
+++ b/t/lex-line.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/lex-multiple.sh b/t/lex-multiple.sh
index ba2555667..f05356c17 100644
--- a/t/lex-multiple.sh
+++ b/t/lex-multiple.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh
index 8d9d5d3ff..7ad6b4272 100644
--- a/t/lex-nodist.sh
+++ b/t/lex-nodist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/lex-noyywrap.sh b/t/lex-noyywrap.sh
index 7ac9ba904..c928738a8 100644
--- a/t/lex-noyywrap.sh
+++ b/t/lex-noyywrap.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/lex-pr204.sh b/t/lex-pr204.sh
index 03f36ba21..c873a11eb 100644
--- a/t/lex-pr204.sh
+++ b/t/lex-pr204.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/lex-subobj-nodep.sh b/t/lex-subobj-nodep.sh
index fac38b1c2..d6900bb43 100644
--- a/t/lex-subobj-nodep.sh
+++ b/t/lex-subobj-nodep.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/lex.sh b/t/lex.sh
index 82a46d0ac..6f63e24ab 100644
--- a/t/lex.sh
+++ b/t/lex.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/lex2.sh b/t/lex2.sh
index d93e8663b..1d72ccdf7 100644
--- a/t/lex2.sh
+++ b/t/lex2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/lex3.sh b/t/lex3.sh
index 424be636b..b737eae41 100644
--- a/t/lex3.sh
+++ b/t/lex3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/lex5.sh b/t/lex5.sh
index d4e49d77d..ac35f7e1d 100644
--- a/t/lex5.sh
+++ b/t/lex5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/lexcpp.sh b/t/lexcpp.sh
index 79c291184..20b5058d1 100644
--- a/t/lexcpp.sh
+++ b/t/lexcpp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/lexvpath.sh b/t/lexvpath.sh
index 25071e4ad..23f884d22 100644
--- a/t/lexvpath.sh
+++ b/t/lexvpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/lflags-cxx.sh b/t/lflags-cxx.sh
index b34e97269..9a225846f 100644
--- a/t/lflags-cxx.sh
+++ b/t/lflags-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/lflags.sh b/t/lflags.sh
index 56f61373a..ebbc8e70a 100644
--- a/t/lflags.sh
+++ b/t/lflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/libexec.sh b/t/libexec.sh
index b1dfe3d12..715a3ce6e 100644
--- a/t/libexec.sh
+++ b/t/libexec.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/libobj-basic.sh b/t/libobj-basic.sh
index 9f1eb2a07..76a836ab0 100644
--- a/t/libobj-basic.sh
+++ b/t/libobj-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/libobj10.sh b/t/libobj10.sh
index 9d56c3449..efccca181 100644
--- a/t/libobj10.sh
+++ b/t/libobj10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/libobj12.sh b/t/libobj12.sh
index c594eacae..e124b6cd4 100644
--- a/t/libobj12.sh
+++ b/t/libobj12.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/libobj13.sh b/t/libobj13.sh
index 9e62be208..4e4a4e867 100644
--- a/t/libobj13.sh
+++ b/t/libobj13.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/libobj14.sh b/t/libobj14.sh
index 8d40cd936..c02e9e039 100644
--- a/t/libobj14.sh
+++ b/t/libobj14.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/libobj15a.sh b/t/libobj15a.sh
index 188166e01..a38d76e91 100644
--- a/t/libobj15a.sh
+++ b/t/libobj15a.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/libobj15b.sh b/t/libobj15b.sh
index 0ffb94bea..ed35da768 100644
--- a/t/libobj15b.sh
+++ b/t/libobj15b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/libobj15c.sh b/t/libobj15c.sh
index a9200b92f..70388a3c6 100644
--- a/t/libobj15c.sh
+++ b/t/libobj15c.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/libobj16a.sh b/t/libobj16a.sh
index a2ca83380..82ecb93c0 100644
--- a/t/libobj16a.sh
+++ b/t/libobj16a.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/libobj16b.sh b/t/libobj16b.sh
index 78bd8e7a9..a020200d5 100644
--- a/t/libobj16b.sh
+++ b/t/libobj16b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/libobj17.sh b/t/libobj17.sh
index 8b23bd3ad..769c99b79 100644
--- a/t/libobj17.sh
+++ b/t/libobj17.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/libobj18.sh b/t/libobj18.sh
index 819f0df93..275f403f5 100644
--- a/t/libobj18.sh
+++ b/t/libobj18.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/libobj19.sh b/t/libobj19.sh
index fd1e267cb..0b679fab9 100644
--- a/t/libobj19.sh
+++ b/t/libobj19.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/libobj2.sh b/t/libobj2.sh
index 48e461c2c..3c736882a 100644
--- a/t/libobj2.sh
+++ b/t/libobj2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/libobj20b.sh b/t/libobj20b.sh
index 2229877fd..17204aa1d 100644
--- a/t/libobj20b.sh
+++ b/t/libobj20b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/libobj20c.sh b/t/libobj20c.sh
index d81433e76..eb5d77c64 100644
--- a/t/libobj20c.sh
+++ b/t/libobj20c.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/libobj3.sh b/t/libobj3.sh
index b518f1f53..d92a4f14d 100644
--- a/t/libobj3.sh
+++ b/t/libobj3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/libobj4.sh b/t/libobj4.sh
index 9131ab6f0..8a5b8f518 100644
--- a/t/libobj4.sh
+++ b/t/libobj4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/libobj5.sh b/t/libobj5.sh
index 50ea3e74c..1e9750221 100644
--- a/t/libobj5.sh
+++ b/t/libobj5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/libobj7.sh b/t/libobj7.sh
index dcc0b7620..b2eaa38fe 100644
--- a/t/libobj7.sh
+++ b/t/libobj7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/library.sh b/t/library.sh
index bda669cd0..454f66b5c 100644
--- a/t/library.sh
+++ b/t/library.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/library2.sh b/t/library2.sh
index 7eac6c6eb..568523518 100644
--- a/t/library2.sh
+++ b/t/library2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/library3.sh b/t/library3.sh
index 2b8baf217..069bfca92 100644
--- a/t/library3.sh
+++ b/t/library3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/libtoo10.sh b/t/libtoo10.sh
index 679d535c5..d7568359f 100644
--- a/t/libtoo10.sh
+++ b/t/libtoo10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2017 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
diff --git a/t/libtoo11.sh b/t/libtoo11.sh
index 527b3fbf3..a281ab949 100644
--- a/t/libtoo11.sh
+++ b/t/libtoo11.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/libtool-macros.sh b/t/libtool-macros.sh
index a66b24ee1..5030de699 100644
--- a/t/libtool-macros.sh
+++ b/t/libtool-macros.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/libtool.sh b/t/libtool.sh
index cb9b187c1..4bc0d9a94 100644
--- a/t/libtool.sh
+++ b/t/libtool.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/libtool2.sh b/t/libtool2.sh
index 7e48b7ec5..f41316b26 100644
--- a/t/libtool2.sh
+++ b/t/libtool2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/libtool3.sh b/t/libtool3.sh
index eec1ca194..24795d537 100644
--- a/t/libtool3.sh
+++ b/t/libtool3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/libtool4.sh b/t/libtool4.sh
index 59607d737..387492e8b 100644
--- a/t/libtool4.sh
+++ b/t/libtool4.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/libtool5.sh b/t/libtool5.sh
index 0b23f3a0c..cc2777c4d 100644
--- a/t/libtool5.sh
+++ b/t/libtool5.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/libtool6.sh b/t/libtool6.sh
index 4b1f1c800..643afed13 100644
--- a/t/libtool6.sh
+++ b/t/libtool6.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/libtool7.sh b/t/libtool7.sh
index 2f3b37b66..0dec8b925 100644
--- a/t/libtool7.sh
+++ b/t/libtool7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/libtool8.sh b/t/libtool8.sh
index 5d9830a63..5b73b43d7 100644
--- a/t/libtool8.sh
+++ b/t/libtool8.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/libtool9.sh b/t/libtool9.sh
index 8f9e504fa..f955ba794 100644
--- a/t/libtool9.sh
+++ b/t/libtool9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/license.sh b/t/license.sh
index 995f89525..a2519b98b 100644
--- a/t/license.sh
+++ b/t/license.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/license2.sh b/t/license2.sh
index 235a5533f..d2704ac17 100644
--- a/t/license2.sh
+++ b/t/license2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/link_c_cxx.sh b/t/link_c_cxx.sh
index 5fa149d33..b53fa680d 100644
--- a/t/link_c_cxx.sh
+++ b/t/link_c_cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/link_cond.sh b/t/link_cond.sh
index a03a7a234..ebbfa9967 100644
--- a/t/link_cond.sh
+++ b/t/link_cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/link_dist.sh b/t/link_dist.sh
index 3de4252ed..d891c2bab 100644
--- a/t/link_dist.sh
+++ b/t/link_dist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/link_f90_only.sh b/t/link_f90_only.sh
index 03cc2429d..5a0764e1f 100644
--- a/t/link_f90_only.sh
+++ b/t/link_f90_only.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/link_f_only.sh b/t/link_f_only.sh
index ff0f34fad..eb1f3fad2 100644
--- a/t/link_f_only.sh
+++ b/t/link_f_only.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/link_fc.sh b/t/link_fc.sh
index 6744188d6..ba4fab8a8 100644
--- a/t/link_fc.sh
+++ b/t/link_fc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/link_fccxx.sh b/t/link_fccxx.sh
index 3218c97c8..fcb3eb44d 100644
--- a/t/link_fccxx.sh
+++ b/t/link_fccxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/link_fcxx.sh b/t/link_fcxx.sh
index 6fd545c80..09a3c2b85 100644
--- a/t/link_fcxx.sh
+++ b/t/link_fcxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/link_override.sh b/t/link_override.sh
index dcc12d84d..b9e3ca1a5 100644
--- a/t/link_override.sh
+++ b/t/link_override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/lisp-flags.sh b/t/lisp-flags.sh
index 932df63d0..8085b2240 100644
--- a/t/lisp-flags.sh
+++ b/t/lisp-flags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/lisp-loadpath.sh b/t/lisp-loadpath.sh
index 1a12bf171..17e2a3be5 100644
--- a/t/lisp-loadpath.sh
+++ b/t/lisp-loadpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/lisp-pr11806.sh b/t/lisp-pr11806.sh
index 67985366f..b85695d31 100644
--- a/t/lisp-pr11806.sh
+++ b/t/lisp-pr11806.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/lisp-subdir-mix.sh b/t/lisp-subdir-mix.sh
index 6e8c2bee4..1db1f7fb1 100644
--- a/t/lisp-subdir-mix.sh
+++ b/t/lisp-subdir-mix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/lisp-subdir.sh b/t/lisp-subdir.sh
index dfa4f29a9..406e3b901 100644
--- a/t/lisp-subdir.sh
+++ b/t/lisp-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/lisp-subdir2.sh b/t/lisp-subdir2.sh
index 7b09fb45c..a67e1748c 100644
--- a/t/lisp-subdir2.sh
+++ b/t/lisp-subdir2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/lisp2.sh b/t/lisp2.sh
index 7ad58fc4d..48d2ee0ff 100644
--- a/t/lisp2.sh
+++ b/t/lisp2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/lisp3.sh b/t/lisp3.sh
index baf5141c2..ed2b13c65 100644
--- a/t/lisp3.sh
+++ b/t/lisp3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/lisp4.sh b/t/lisp4.sh
index dd1754cb2..53d5812de 100644
--- a/t/lisp4.sh
+++ b/t/lisp4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/lisp5.sh b/t/lisp5.sh
index ed17d27e4..e0d28cd34 100644
--- a/t/lisp5.sh
+++ b/t/lisp5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/lisp6.sh b/t/lisp6.sh
index 97c25daf4..042c41e3c 100644
--- a/t/lisp6.sh
+++ b/t/lisp6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/lisp7.sh b/t/lisp7.sh
index b0d877e96..c7681aba7 100644
--- a/t/lisp7.sh
+++ b/t/lisp7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/lisp8.sh b/t/lisp8.sh
index 59ba669b9..74220ab86 100644
--- a/t/lisp8.sh
+++ b/t/lisp8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/lispdry.sh b/t/lispdry.sh
index 5954c202c..87c8ba1ff 100644
--- a/t/lispdry.sh
+++ b/t/lispdry.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 060b3ed1c..051ac0c70 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -2,7 +2,7 @@
## testsuite. This fragment is meant to be included by the Makefile.am,
## but also to be executed directly by make when bootstrapping automake.
-## Copyright (C) 2011-2015 Free Software Foundation, Inc.
+## Copyright (C) 2011-2017 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
diff --git a/t/listval.sh b/t/listval.sh
index fb8b6b701..76eabad31 100644
--- a/t/listval.sh
+++ b/t/listval.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/location.sh b/t/location.sh
index da63ef7f1..f3b4a1124 100644
--- a/t/location.sh
+++ b/t/location.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/longlin2.sh b/t/longlin2.sh
index 5b6f5f837..d28142f4a 100644
--- a/t/longlin2.sh
+++ b/t/longlin2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/longline.sh b/t/longline.sh
index 00c133ec8..63dc32cc3 100644
--- a/t/longline.sh
+++ b/t/longline.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/ltcond.sh b/t/ltcond.sh
index 8ffc5b7ee..c4f959588 100644
--- a/t/ltcond.sh
+++ b/t/ltcond.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/ltcond2.sh b/t/ltcond2.sh
index 1fdee3846..f2ec9ecda 100644
--- a/t/ltcond2.sh
+++ b/t/ltcond2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/ltconv.sh b/t/ltconv.sh
index a79898824..6ec44a54e 100644
--- a/t/ltconv.sh
+++ b/t/ltconv.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/ltdeps.sh b/t/ltdeps.sh
index 12b8f6483..5623053d7 100644
--- a/t/ltdeps.sh
+++ b/t/ltdeps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/ltinit.sh b/t/ltinit.sh
index 55d21298c..9d41a88f7 100644
--- a/t/ltinit.sh
+++ b/t/ltinit.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/ltinstloc.sh b/t/ltinstloc.sh
index 4a779b591..47ce1ac9b 100644
--- a/t/ltinstloc.sh
+++ b/t/ltinstloc.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/ltlibobjs.sh b/t/ltlibobjs.sh
index 3b3f01118..d95dea3a0 100644
--- a/t/ltlibobjs.sh
+++ b/t/ltlibobjs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/ltlibsrc.sh b/t/ltlibsrc.sh
index 8a11e20e6..8f81cbe78 100644
--- a/t/ltlibsrc.sh
+++ b/t/ltlibsrc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/ltorder.sh b/t/ltorder.sh
index 2c676700f..0a99f2915 100644
--- a/t/ltorder.sh
+++ b/t/ltorder.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/m4-inclusion.sh b/t/m4-inclusion.sh
index e12e9bdf4..9778b3805 100644
--- a/t/m4-inclusion.sh
+++ b/t/m4-inclusion.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/maintclean-vpath.sh b/t/maintclean-vpath.sh
index ba207b525..f50a58b6d 100644
--- a/t/maintclean-vpath.sh
+++ b/t/maintclean-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/maintclean.sh b/t/maintclean.sh
index fcb566056..67fc5cf93 100644
--- a/t/maintclean.sh
+++ b/t/maintclean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/maintmode-configure-msg.sh b/t/maintmode-configure-msg.sh
index 9d3cd61e9..d2eaf9097 100644
--- a/t/maintmode-configure-msg.sh
+++ b/t/maintmode-configure-msg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/make-dryrun.tap b/t/make-dryrun.tap
index 3cd9e5a3d..203f97565 100644
--- a/t/make-dryrun.tap
+++ b/t/make-dryrun.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/make-is-gnu.sh b/t/make-is-gnu.sh
index de4eb29c7..13fb176d4 100644
--- a/t/make-is-gnu.sh
+++ b/t/make-is-gnu.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/make-keepgoing.tap b/t/make-keepgoing.tap
index c509d3f3c..cce23c384 100644
--- a/t/make-keepgoing.tap
+++ b/t/make-keepgoing.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/make.sh b/t/make.sh
index 43cde411f..8ff715f61 100644
--- a/t/make.sh
+++ b/t/make.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/makefile-deps.sh b/t/makefile-deps.sh
index d0abb10d0..0d4e9cae4 100644
--- a/t/makefile-deps.sh
+++ b/t/makefile-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/makej.sh b/t/makej.sh
index 8e4091758..80efd641f 100644
--- a/t/makej.sh
+++ b/t/makej.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/makej2.sh b/t/makej2.sh
index 59fcfbaff..c23d8f65f 100644
--- a/t/makej2.sh
+++ b/t/makej2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/maken.sh b/t/maken.sh
index 673e75abc..ce9c22eb1 100644
--- a/t/maken.sh
+++ b/t/maken.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/maken3.sh b/t/maken3.sh
index 6b0c03bb2..6fc6fd856 100644
--- a/t/maken3.sh
+++ b/t/maken3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/makevars.sh b/t/makevars.sh
index b6320ca4a..691a52bc2 100644
--- a/t/makevars.sh
+++ b/t/makevars.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/man.sh b/t/man.sh
index c6f3b7c03..8b5c1f547 100644
--- a/t/man.sh
+++ b/t/man.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/man2.sh b/t/man2.sh
index 2bf585742..a21293814 100644
--- a/t/man2.sh
+++ b/t/man2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/man3.sh b/t/man3.sh
index 54768f686..65f7e7f45 100644
--- a/t/man3.sh
+++ b/t/man3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/man5.sh b/t/man5.sh
index 24245ee7d..2dff9d3e7 100644
--- a/t/man5.sh
+++ b/t/man5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/man6.sh b/t/man6.sh
index 6f03c7cff..c160981c8 100644
--- a/t/man6.sh
+++ b/t/man6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/man7.sh b/t/man7.sh
index 65f7e9067..14a50004d 100644
--- a/t/man7.sh
+++ b/t/man7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/man8.sh b/t/man8.sh
index ab48610b6..f5c5e02ff 100644
--- a/t/man8.sh
+++ b/t/man8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/mdate.sh b/t/mdate.sh
index 950e31ab0..c0930385c 100644
--- a/t/mdate.sh
+++ b/t/mdate.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/mdate2.sh b/t/mdate2.sh
index 07d26a46c..2eabac12b 100644
--- a/t/mdate2.sh
+++ b/t/mdate2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/mdate3.sh b/t/mdate3.sh
index 6051c1a73..6a7d39e6f 100644
--- a/t/mdate3.sh
+++ b/t/mdate3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/mdate4.sh b/t/mdate4.sh
index fea19647c..d5a5cc297 100644
--- a/t/mdate4.sh
+++ b/t/mdate4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/mdate5.sh b/t/mdate5.sh
index f6a7d20f8..7cbaba62b 100644
--- a/t/mdate5.sh
+++ b/t/mdate5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/mdate6.sh b/t/mdate6.sh
index 60fc9c48e..6b657ea9c 100644
--- a/t/mdate6.sh
+++ b/t/mdate6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/missing-auxfile-stops-makefiles-creation.sh b/t/missing-auxfile-stops-makefiles-creation.sh
index f28124701..64c7b2d0e 100644
--- a/t/missing-auxfile-stops-makefiles-creation.sh
+++ b/t/missing-auxfile-stops-makefiles-creation.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/missing-version-mismatch.sh b/t/missing-version-mismatch.sh
index 53a9fe943..e06ccd6c6 100644
--- a/t/missing-version-mismatch.sh
+++ b/t/missing-version-mismatch.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/missing3.sh b/t/missing3.sh
index a996114f2..2a6f2f380 100644
--- a/t/missing3.sh
+++ b/t/missing3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/mkinst2.sh b/t/mkinst2.sh
index a05cf7060..309dd4021 100644
--- a/t/mkinst2.sh
+++ b/t/mkinst2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/mkinst3.sh b/t/mkinst3.sh
index d725fdacf..e667f4856 100644
--- a/t/mkinst3.sh
+++ b/t/mkinst3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/mkinstall.sh b/t/mkinstall.sh
index ba58ef22d..301844615 100644
--- a/t/mkinstall.sh
+++ b/t/mkinstall.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/mmode.sh b/t/mmode.sh
index f34429fd5..aa9b6299a 100644
--- a/t/mmode.sh
+++ b/t/mmode.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/mmodely.sh b/t/mmodely.sh
index 63f3409e8..38a70e446 100644
--- a/t/mmodely.sh
+++ b/t/mmodely.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/no-extra-c-stuff.sh b/t/no-extra-c-stuff.sh
index 232c20f24..700059b73 100644
--- a/t/no-extra-c-stuff.sh
+++ b/t/no-extra-c-stuff.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/no-extra-makefile-code.sh b/t/no-extra-makefile-code.sh
index e1e9ec8a3..7fb7bd8cb 100644
--- a/t/no-extra-makefile-code.sh
+++ b/t/no-extra-makefile-code.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/no-spurious-install-recursive.sh b/t/no-spurious-install-recursive.sh
index 8c17bac97..88ecb8640 100644
--- a/t/no-spurious-install-recursive.sh
+++ b/t/no-spurious-install-recursive.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/nobase-libtool.sh b/t/nobase-libtool.sh
index e389671ed..42dcad754 100644
--- a/t/nobase-libtool.sh
+++ b/t/nobase-libtool.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/nobase-nodist.sh b/t/nobase-nodist.sh
index 2780ec9e9..e42a86d29 100644
--- a/t/nobase-nodist.sh
+++ b/t/nobase-nodist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/nobase-python.sh b/t/nobase-python.sh
index f73fe8a6b..ba197d025 100644
--- a/t/nobase-python.sh
+++ b/t/nobase-python.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/nobase.sh b/t/nobase.sh
index e4114dada..25d613bd4 100644
--- a/t/nobase.sh
+++ b/t/nobase.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/nodef.sh b/t/nodef.sh
index 4918961c5..889d968e8 100644
--- a/t/nodef.sh
+++ b/t/nodef.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/nodef2.sh b/t/nodef2.sh
index 1cbf22ded..c5e729e3c 100644
--- a/t/nodef2.sh
+++ b/t/nodef2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/nodep.sh b/t/nodep.sh
index 641f7db06..1fb77e09a 100644
--- a/t/nodep.sh
+++ b/t/nodep.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/nodep2.sh b/t/nodep2.sh
index 1cab2b962..2dcb2716b 100644
--- a/t/nodep2.sh
+++ b/t/nodep2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/nodepcomp.sh b/t/nodepcomp.sh
index e54f18478..e6d9e5811 100644
--- a/t/nodepcomp.sh
+++ b/t/nodepcomp.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/t/nodist.sh b/t/nodist.sh
index e9d918e47..d0d51b35f 100644
--- a/t/nodist.sh
+++ b/t/nodist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/nodist2.sh b/t/nodist2.sh
index 39cfa69d5..750a0988f 100644
--- a/t/nodist2.sh
+++ b/t/nodist2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/nodist3.sh b/t/nodist3.sh
index 010439f5e..2131fe773 100644
--- a/t/nodist3.sh
+++ b/t/nodist3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/noinst.sh b/t/noinst.sh
index dd994a6ef..4e306c548 100644
--- a/t/noinst.sh
+++ b/t/noinst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/noinstdir.sh b/t/noinstdir.sh
index c5aff832d..8424380cb 100644
--- a/t/noinstdir.sh
+++ b/t/noinstdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/nolink.sh b/t/nolink.sh
index 9a98b7683..b5f5a0b40 100644
--- a/t/nolink.sh
+++ b/t/nolink.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/nostdinc.sh b/t/nostdinc.sh
index 857bc08a0..363a5c2a6 100644
--- a/t/nostdinc.sh
+++ b/t/nostdinc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/notrans.sh b/t/notrans.sh
index b9c1b1f53..b85b7d7f6 100644
--- a/t/notrans.sh
+++ b/t/notrans.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/number.sh b/t/number.sh
index 71dd029b2..f037c68e1 100644
--- a/t/number.sh
+++ b/t/number.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/objc-basic.sh b/t/objc-basic.sh
index 2ce83e67b..8dad76f8b 100644
--- a/t/objc-basic.sh
+++ b/t/objc-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/objc-deps.sh b/t/objc-deps.sh
index c8eac75d7..5914ddd87 100644
--- a/t/objc-deps.sh
+++ b/t/objc-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/objc-flags.sh b/t/objc-flags.sh
index 523c5b474..0a7444a92 100644
--- a/t/objc-flags.sh
+++ b/t/objc-flags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/objc-megademo.sh b/t/objc-megademo.sh
index f49a853d3..6b54d1f5b 100644
--- a/t/objc-megademo.sh
+++ b/t/objc-megademo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/objc-minidemo.sh b/t/objc-minidemo.sh
index f8f8c7343..8c313b410 100644
--- a/t/objc-minidemo.sh
+++ b/t/objc-minidemo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/objcxx-basic.sh b/t/objcxx-basic.sh
index 45584433a..b4a0944d9 100644
--- a/t/objcxx-basic.sh
+++ b/t/objcxx-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/objcxx-deps.sh b/t/objcxx-deps.sh
index be565848f..4494fd8e5 100644
--- a/t/objcxx-deps.sh
+++ b/t/objcxx-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/objcxx-flags.sh b/t/objcxx-flags.sh
index e8c21b621..7c104a5d0 100644
--- a/t/objcxx-flags.sh
+++ b/t/objcxx-flags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/objcxx-minidemo.sh b/t/objcxx-minidemo.sh
index d3d50d1f7..f4477d4c1 100644
--- a/t/objcxx-minidemo.sh
+++ b/t/objcxx-minidemo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/objext-pr10128.sh b/t/objext-pr10128.sh
index 507a8a8c8..2f3eb1d05 100644
--- a/t/objext-pr10128.sh
+++ b/t/objext-pr10128.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/oldvars.sh b/t/oldvars.sh
index 63fd4bfc0..1a17f2efe 100644
--- a/t/oldvars.sh
+++ b/t/oldvars.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/order.sh b/t/order.sh
index d936a07b6..4174d3688 100644
--- a/t/order.sh
+++ b/t/order.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/output-order.sh b/t/output-order.sh
index 8a6f86933..438c1dafd 100644
--- a/t/output-order.sh
+++ b/t/output-order.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/output.sh b/t/output.sh
index 80c46383a..40cde23a8 100644
--- a/t/output.sh
+++ b/t/output.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/output10.sh b/t/output10.sh
index d44234e27..44a89fa1f 100644
--- a/t/output10.sh
+++ b/t/output10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/output11.sh b/t/output11.sh
index 5b7615325..dd0fd537f 100644
--- a/t/output11.sh
+++ b/t/output11.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/output12.sh b/t/output12.sh
index eaa82f134..4e4985126 100644
--- a/t/output12.sh
+++ b/t/output12.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/output13.sh b/t/output13.sh
index d4193105e..f8cd82ed1 100644
--- a/t/output13.sh
+++ b/t/output13.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2017 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
diff --git a/t/output2.sh b/t/output2.sh
index 7efac590d..fbbaf5a45 100644
--- a/t/output2.sh
+++ b/t/output2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/output3.sh b/t/output3.sh
index 9a2da947c..643d1f3c8 100644
--- a/t/output3.sh
+++ b/t/output3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/output4.sh b/t/output4.sh
index d88f81a7f..bd99360b5 100644
--- a/t/output4.sh
+++ b/t/output4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/output5.sh b/t/output5.sh
index f0d11f37a..522c355ca 100644
--- a/t/output5.sh
+++ b/t/output5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/output6.sh b/t/output6.sh
index adaadaa88..efc750c9b 100644
--- a/t/output6.sh
+++ b/t/output6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/output7.sh b/t/output7.sh
index 3cf393ca9..f02f2c059 100644
--- a/t/output7.sh
+++ b/t/output7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/output8.sh b/t/output8.sh
index 5a340b09b..341600de1 100644
--- a/t/output8.sh
+++ b/t/output8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/output9.sh b/t/output9.sh
index 526dd9e51..79f9f67e6 100644
--- a/t/output9.sh
+++ b/t/output9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/override-conditional-1.sh b/t/override-conditional-1.sh
index 65787829e..16afc714b 100644
--- a/t/override-conditional-1.sh
+++ b/t/override-conditional-1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/override-conditional-2.sh b/t/override-conditional-2.sh
index 0c546cc41..5ce601d95 100644
--- a/t/override-conditional-2.sh
+++ b/t/override-conditional-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/override-conditional-pr13940.sh b/t/override-conditional-pr13940.sh
index 733b96e51..6782af8c5 100644
--- a/t/override-conditional-pr13940.sh
+++ b/t/override-conditional-pr13940.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/override-html.sh b/t/override-html.sh
index be8781e5a..8c4820755 100644
--- a/t/override-html.sh
+++ b/t/override-html.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/override-suggest-local.sh b/t/override-suggest-local.sh
index 463417745..4337c6765 100644
--- a/t/override-suggest-local.sh
+++ b/t/override-suggest-local.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/parallel-am.sh b/t/parallel-am.sh
index 9cdc4d4d6..f3b389e8c 100644
--- a/t/parallel-am.sh
+++ b/t/parallel-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/parallel-am2.sh b/t/parallel-am2.sh
index 033c22407..3ab658941 100644
--- a/t/parallel-am2.sh
+++ b/t/parallel-am2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/parallel-am3.sh b/t/parallel-am3.sh
index 85fd655f9..b0a5f3762 100644
--- a/t/parallel-am3.sh
+++ b/t/parallel-am3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/parallel-tests-basics.sh b/t/parallel-tests-basics.sh
index fc393df98..579f514d6 100644
--- a/t/parallel-tests-basics.sh
+++ b/t/parallel-tests-basics.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/parallel-tests-cmdline-override.sh b/t/parallel-tests-cmdline-override.sh
index 848de3fb8..243b85a69 100644
--- a/t/parallel-tests-cmdline-override.sh
+++ b/t/parallel-tests-cmdline-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-concurrency-2.sh b/t/parallel-tests-concurrency-2.sh
index 3ce607973..67e1beb77 100644
--- a/t/parallel-tests-concurrency-2.sh
+++ b/t/parallel-tests-concurrency-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/parallel-tests-concurrency.sh b/t/parallel-tests-concurrency.sh
index 6a32b1aef..3940a5faa 100644
--- a/t/parallel-tests-concurrency.sh
+++ b/t/parallel-tests-concurrency.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/parallel-tests-console-output.sh b/t/parallel-tests-console-output.sh
index a3abaf34d..fa441e037 100644
--- a/t/parallel-tests-console-output.sh
+++ b/t/parallel-tests-console-output.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-driver-install.sh b/t/parallel-tests-driver-install.sh
index d22ec7040..63942bc2e 100644
--- a/t/parallel-tests-driver-install.sh
+++ b/t/parallel-tests-driver-install.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-dry-run-1.sh b/t/parallel-tests-dry-run-1.sh
index 64554cdcc..26deed3b2 100644
--- a/t/parallel-tests-dry-run-1.sh
+++ b/t/parallel-tests-dry-run-1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/parallel-tests-dry-run-2.sh b/t/parallel-tests-dry-run-2.sh
index cb7b96a6b..40a87347e 100644
--- a/t/parallel-tests-dry-run-2.sh
+++ b/t/parallel-tests-dry-run-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-empty-testlogs.sh b/t/parallel-tests-empty-testlogs.sh
index c75f794f9..059284748 100644
--- a/t/parallel-tests-empty-testlogs.sh
+++ b/t/parallel-tests-empty-testlogs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-empty.sh b/t/parallel-tests-empty.sh
index 4da8ac26b..1e17d42fb 100644
--- a/t/parallel-tests-empty.sh
+++ b/t/parallel-tests-empty.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/parallel-tests-exeext.sh b/t/parallel-tests-exeext.sh
index c1b6e6252..40d4b826c 100644
--- a/t/parallel-tests-exeext.sh
+++ b/t/parallel-tests-exeext.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-exit-status-reported.sh b/t/parallel-tests-exit-status-reported.sh
index d3334df4b..e27f0d7f6 100644
--- a/t/parallel-tests-exit-status-reported.sh
+++ b/t/parallel-tests-exit-status-reported.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/parallel-tests-exit-statuses.sh b/t/parallel-tests-exit-statuses.sh
index 6a91de05f..0020edc4d 100644
--- a/t/parallel-tests-exit-statuses.sh
+++ b/t/parallel-tests-exit-statuses.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-extra-programs.sh b/t/parallel-tests-extra-programs.sh
index b4e9ecc70..5ab5537be 100644
--- a/t/parallel-tests-extra-programs.sh
+++ b/t/parallel-tests-extra-programs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-fd-redirect-exeext.sh b/t/parallel-tests-fd-redirect-exeext.sh
index e5c7a8fbb..306eb3919 100644
--- a/t/parallel-tests-fd-redirect-exeext.sh
+++ b/t/parallel-tests-fd-redirect-exeext.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-fd-redirect.sh b/t/parallel-tests-fd-redirect.sh
index 6b5d074e0..98392fc89 100644
--- a/t/parallel-tests-fd-redirect.sh
+++ b/t/parallel-tests-fd-redirect.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-fork-bomb.sh b/t/parallel-tests-fork-bomb.sh
index 2b4b40894..7aa19d800 100644
--- a/t/parallel-tests-fork-bomb.sh
+++ b/t/parallel-tests-fork-bomb.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-generated-and-distributed.sh b/t/parallel-tests-generated-and-distributed.sh
index 7f11a701e..61c0fb999 100644
--- a/t/parallel-tests-generated-and-distributed.sh
+++ b/t/parallel-tests-generated-and-distributed.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/parallel-tests-harderror.sh b/t/parallel-tests-harderror.sh
index bd2c2cf63..32b113a7b 100644
--- a/t/parallel-tests-harderror.sh
+++ b/t/parallel-tests-harderror.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-interrupt.tap b/t/parallel-tests-interrupt.tap
index 630348770..a57667c15 100644
--- a/t/parallel-tests-interrupt.tap
+++ b/t/parallel-tests-interrupt.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-log-compiler-1.sh b/t/parallel-tests-log-compiler-1.sh
index 5516655ea..4168f5200 100644
--- a/t/parallel-tests-log-compiler-1.sh
+++ b/t/parallel-tests-log-compiler-1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/parallel-tests-log-compiler-2.sh b/t/parallel-tests-log-compiler-2.sh
index 5bea90bef..ed836cf34 100644
--- a/t/parallel-tests-log-compiler-2.sh
+++ b/t/parallel-tests-log-compiler-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/parallel-tests-log-compiler-example.sh b/t/parallel-tests-log-compiler-example.sh
index dc94d1c19..32f970228 100644
--- a/t/parallel-tests-log-compiler-example.sh
+++ b/t/parallel-tests-log-compiler-example.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-log-override-1.sh b/t/parallel-tests-log-override-1.sh
index 859caaec7..ea5b99b4d 100644
--- a/t/parallel-tests-log-override-1.sh
+++ b/t/parallel-tests-log-override-1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-log-override-2.sh b/t/parallel-tests-log-override-2.sh
index 63fb79d1f..8066580c3 100644
--- a/t/parallel-tests-log-override-2.sh
+++ b/t/parallel-tests-log-override-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-log-override-recheck.sh b/t/parallel-tests-log-override-recheck.sh
index ec990299e..f72196680 100644
--- a/t/parallel-tests-log-override-recheck.sh
+++ b/t/parallel-tests-log-override-recheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-no-color-in-log.sh b/t/parallel-tests-no-color-in-log.sh
index c9d0fc5e9..7633d24eb 100644
--- a/t/parallel-tests-no-color-in-log.sh
+++ b/t/parallel-tests-no-color-in-log.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-no-spurious-summary.sh b/t/parallel-tests-no-spurious-summary.sh
index 2e6d5d0a1..dbe6b3cdf 100644
--- a/t/parallel-tests-no-spurious-summary.sh
+++ b/t/parallel-tests-no-spurious-summary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/parallel-tests-once.sh b/t/parallel-tests-once.sh
index ddac561af..c4f8b8016 100644
--- a/t/parallel-tests-once.sh
+++ b/t/parallel-tests-once.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-recheck-depends-on-all.sh b/t/parallel-tests-recheck-depends-on-all.sh
index 7420e8e1a..199d10597 100644
--- a/t/parallel-tests-recheck-depends-on-all.sh
+++ b/t/parallel-tests-recheck-depends-on-all.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/parallel-tests-recheck-pr11791.sh b/t/parallel-tests-recheck-pr11791.sh
index 3c34b7dcd..9eccf92f1 100644
--- a/t/parallel-tests-recheck-pr11791.sh
+++ b/t/parallel-tests-recheck-pr11791.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/parallel-tests-recheck.sh b/t/parallel-tests-recheck.sh
index 6db3301b9..9a84fea78 100644
--- a/t/parallel-tests-recheck.sh
+++ b/t/parallel-tests-recheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/parallel-tests-reset-term.sh b/t/parallel-tests-reset-term.sh
index 39b0ba8b5..c77c9a37c 100644
--- a/t/parallel-tests-reset-term.sh
+++ b/t/parallel-tests-reset-term.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-subdir.sh b/t/parallel-tests-subdir.sh
index a27514a34..86796035d 100644
--- a/t/parallel-tests-subdir.sh
+++ b/t/parallel-tests-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parallel-tests-suffix-prog.sh b/t/parallel-tests-suffix-prog.sh
index 26151ae5c..4163dbcf1 100644
--- a/t/parallel-tests-suffix-prog.sh
+++ b/t/parallel-tests-suffix-prog.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/parallel-tests-suffix.sh b/t/parallel-tests-suffix.sh
index 433a203ac..c3dc0a5b2 100644
--- a/t/parallel-tests-suffix.sh
+++ b/t/parallel-tests-suffix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/parallel-tests-trailing-whitespace.sh b/t/parallel-tests-trailing-whitespace.sh
index 61ba66d74..9211c56cf 100644
--- a/t/parallel-tests-trailing-whitespace.sh
+++ b/t/parallel-tests-trailing-whitespace.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/parallel-tests-unreadable.sh b/t/parallel-tests-unreadable.sh
index f9f7a8040..fec728610 100644
--- a/t/parallel-tests-unreadable.sh
+++ b/t/parallel-tests-unreadable.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/parse.sh b/t/parse.sh
index 3432f54a3..972ff6d9d 100644
--- a/t/parse.sh
+++ b/t/parse.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/per-target-flags.sh b/t/per-target-flags.sh
index 264fbb220..889a32688 100644
--- a/t/per-target-flags.sh
+++ b/t/per-target-flags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/percent.sh b/t/percent.sh
index afea9a0b3..877679332 100644
--- a/t/percent.sh
+++ b/t/percent.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/percent2.sh b/t/percent2.sh
index 5b33b0f09..eb088abde 100644
--- a/t/percent2.sh
+++ b/t/percent2.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/perf/cond.sh b/t/perf/cond.sh
index fb74c98d6..fef5557c5 100755
--- a/t/perf/cond.sh
+++ b/t/perf/cond.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/perf/testsuite-recheck.sh b/t/perf/testsuite-recheck.sh
index 6c1299ba7..2b5fa198e 100755
--- a/t/perf/testsuite-recheck.sh
+++ b/t/perf/testsuite-recheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/perf/testsuite-summary.sh b/t/perf/testsuite-summary.sh
index aa21dabca..d4a6261eb 100755
--- a/t/perf/testsuite-summary.sh
+++ b/t/perf/testsuite-summary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/phony.sh b/t/phony.sh
index 6e6cf403c..44e4b3089 100644
--- a/t/phony.sh
+++ b/t/phony.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/pkg-config-macros.sh b/t/pkg-config-macros.sh
index 500505c8c..a69bc8fa3 100644
--- a/t/pkg-config-macros.sh
+++ b/t/pkg-config-macros.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/pluseq.sh b/t/pluseq.sh
index 3bfeb32cc..109537ecc 100644
--- a/t/pluseq.sh
+++ b/t/pluseq.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/pluseq10.sh b/t/pluseq10.sh
index 6fdd69396..237098261 100644
--- a/t/pluseq10.sh
+++ b/t/pluseq10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/pluseq11.sh b/t/pluseq11.sh
index 132b49f6c..2717c28a6 100644
--- a/t/pluseq11.sh
+++ b/t/pluseq11.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/pluseq2.sh b/t/pluseq2.sh
index 06edb8a6a..b6cc80e29 100644
--- a/t/pluseq2.sh
+++ b/t/pluseq2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/pluseq3.sh b/t/pluseq3.sh
index 4336a2337..9e648b71c 100644
--- a/t/pluseq3.sh
+++ b/t/pluseq3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/pluseq4.sh b/t/pluseq4.sh
index d795cf58c..385e6637f 100644
--- a/t/pluseq4.sh
+++ b/t/pluseq4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/pluseq5.sh b/t/pluseq5.sh
index c30851e97..b1880f7c6 100644
--- a/t/pluseq5.sh
+++ b/t/pluseq5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/pluseq6.sh b/t/pluseq6.sh
index 11c9f9f75..0a473a8bb 100644
--- a/t/pluseq6.sh
+++ b/t/pluseq6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/pluseq7.sh b/t/pluseq7.sh
index e58f02d2a..fb0f904e9 100644
--- a/t/pluseq7.sh
+++ b/t/pluseq7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/pluseq8.sh b/t/pluseq8.sh
index 091e33d35..8fd868c4d 100644
--- a/t/pluseq8.sh
+++ b/t/pluseq8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/pluseq9.sh b/t/pluseq9.sh
index ae604e59b..d970e398c 100644
--- a/t/pluseq9.sh
+++ b/t/pluseq9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/pm/Cond2.pl b/t/pm/Cond2.pl
index 6a5fcfab9..5ec2d2352 100644
--- a/t/pm/Cond2.pl
+++ b/t/pm/Cond2.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/pm/Cond3.pl b/t/pm/Cond3.pl
index aef70d1e6..477a02c74 100644
--- a/t/pm/Cond3.pl
+++ b/t/pm/Cond3.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/pm/Condition-t.pl b/t/pm/Condition-t.pl
index 1bb938b73..bc78edd02 100644
--- a/t/pm/Condition-t.pl
+++ b/t/pm/Condition-t.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/pm/Condition.pl b/t/pm/Condition.pl
index 81e854f95..4d85be4e8 100644
--- a/t/pm/Condition.pl
+++ b/t/pm/Condition.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/pm/DisjCon2.pl b/t/pm/DisjCon2.pl
index 6b953a6e9..80fa63778 100644
--- a/t/pm/DisjCon2.pl
+++ b/t/pm/DisjCon2.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/pm/DisjCon3.pl b/t/pm/DisjCon3.pl
index 0049c7406..09ae1f5f7 100644
--- a/t/pm/DisjCon3.pl
+++ b/t/pm/DisjCon3.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/pm/DisjConditions-t.pl b/t/pm/DisjConditions-t.pl
index e83b480ff..7d666bca9 100644
--- a/t/pm/DisjConditions-t.pl
+++ b/t/pm/DisjConditions-t.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/pm/DisjConditions.pl b/t/pm/DisjConditions.pl
index 2d7e5daa0..5abe2c004 100644
--- a/t/pm/DisjConditions.pl
+++ b/t/pm/DisjConditions.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/pm/Version.pl b/t/pm/Version.pl
index aedc24a8a..26611bb2e 100644
--- a/t/pm/Version.pl
+++ b/t/pm/Version.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/pm/Version2.pl b/t/pm/Version2.pl
index 0ff3dc1b1..c9e4d7884 100644
--- a/t/pm/Version2.pl
+++ b/t/pm/Version2.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/pm/Version3.pl b/t/pm/Version3.pl
index 64b2488ca..1f156e11b 100644
--- a/t/pm/Version3.pl
+++ b/t/pm/Version3.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/pm/Wrap.pl b/t/pm/Wrap.pl
index ed51c6f84..80c36f1f6 100644
--- a/t/pm/Wrap.pl
+++ b/t/pm/Wrap.pl
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/posixsubst-data.sh b/t/posixsubst-data.sh
index ebeff1128..2b2351195 100644
--- a/t/posixsubst-data.sh
+++ b/t/posixsubst-data.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/posixsubst-extradist.sh b/t/posixsubst-extradist.sh
index 1446759d7..51253d2ee 100644
--- a/t/posixsubst-extradist.sh
+++ b/t/posixsubst-extradist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/posixsubst-ldadd.sh b/t/posixsubst-ldadd.sh
index 635666d53..b681ee216 100644
--- a/t/posixsubst-ldadd.sh
+++ b/t/posixsubst-ldadd.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/posixsubst-libraries.sh b/t/posixsubst-libraries.sh
index 079c12c7f..cd0dd9a4f 100644
--- a/t/posixsubst-libraries.sh
+++ b/t/posixsubst-libraries.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/posixsubst-ltlibraries.sh b/t/posixsubst-ltlibraries.sh
index 175dfb146..9d258825a 100644
--- a/t/posixsubst-ltlibraries.sh
+++ b/t/posixsubst-ltlibraries.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/posixsubst-programs.sh b/t/posixsubst-programs.sh
index d94362239..b00bfc2a8 100644
--- a/t/posixsubst-programs.sh
+++ b/t/posixsubst-programs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/posixsubst-scripts.sh b/t/posixsubst-scripts.sh
index 35bc0358c..9289bc468 100644
--- a/t/posixsubst-scripts.sh
+++ b/t/posixsubst-scripts.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/posixsubst-sources.sh b/t/posixsubst-sources.sh
index 0c75b2764..db820255a 100644
--- a/t/posixsubst-sources.sh
+++ b/t/posixsubst-sources.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/posixsubst-tests.sh b/t/posixsubst-tests.sh
index 6b38e615f..7d0f990aa 100644
--- a/t/posixsubst-tests.sh
+++ b/t/posixsubst-tests.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/ppf77.sh b/t/ppf77.sh
index 050ca8fb8..1c84d244a 100644
--- a/t/ppf77.sh
+++ b/t/ppf77.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/pr2.sh b/t/pr2.sh
index dd4302024..4525bb1db 100644
--- a/t/pr2.sh
+++ b/t/pr2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/pr211.sh b/t/pr211.sh
index 7c5af36c7..69926967a 100644
--- a/t/pr211.sh
+++ b/t/pr211.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/pr220.sh b/t/pr220.sh
index af5236cb4..c9bf9cbe3 100644
--- a/t/pr220.sh
+++ b/t/pr220.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/pr224.sh b/t/pr224.sh
index bca1d3037..ddf675541 100644
--- a/t/pr224.sh
+++ b/t/pr224.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/pr229.sh b/t/pr229.sh
index db9723234..3d8beb688 100644
--- a/t/pr229.sh
+++ b/t/pr229.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/pr243.sh b/t/pr243.sh
index cc0000a99..aae4d07f3 100644
--- a/t/pr243.sh
+++ b/t/pr243.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/pr266.sh b/t/pr266.sh
index 6aad68948..b48aa4f73 100644
--- a/t/pr266.sh
+++ b/t/pr266.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/pr279-2.sh b/t/pr279-2.sh
index 37340a383..e8902ff06 100644
--- a/t/pr279-2.sh
+++ b/t/pr279-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/pr279.sh b/t/pr279.sh
index 0d0302fed..e076a2d30 100644
--- a/t/pr279.sh
+++ b/t/pr279.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/pr287.sh b/t/pr287.sh
index 215d0485b..4f416e0b2 100644
--- a/t/pr287.sh
+++ b/t/pr287.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/pr300-lib.sh b/t/pr300-lib.sh
index 91356df42..5255ccce9 100644
--- a/t/pr300-lib.sh
+++ b/t/pr300-lib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/pr300-ltlib.sh b/t/pr300-ltlib.sh
index 47dd5341e..48ea3e0c2 100644
--- a/t/pr300-ltlib.sh
+++ b/t/pr300-ltlib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/pr300-prog.sh b/t/pr300-prog.sh
index a159c0ba9..d5cf2cb2b 100644
--- a/t/pr300-prog.sh
+++ b/t/pr300-prog.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/pr307.sh b/t/pr307.sh
index 6f8ff2f97..87f4e05a4 100644
--- a/t/pr307.sh
+++ b/t/pr307.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/pr401.sh b/t/pr401.sh
index 1a44927a5..027d61d4c 100644
--- a/t/pr401.sh
+++ b/t/pr401.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/pr401b.sh b/t/pr401b.sh
index 48815a1e3..cc769f697 100644
--- a/t/pr401b.sh
+++ b/t/pr401b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/pr401c.sh b/t/pr401c.sh
index e92a25318..78381fbae 100644
--- a/t/pr401c.sh
+++ b/t/pr401c.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/pr72.sh b/t/pr72.sh
index 4dfc51ac2..f7b77d80e 100644
--- a/t/pr72.sh
+++ b/t/pr72.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/t/pr87.sh b/t/pr87.sh
index 61fa11b96..26ea30b3d 100644
--- a/t/pr87.sh
+++ b/t/pr87.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/t/pr9.sh b/t/pr9.sh
index 3f4df12a5..67eacac92 100644
--- a/t/pr9.sh
+++ b/t/pr9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/precious.sh b/t/precious.sh
index 56a4e774b..b819249f3 100644
--- a/t/precious.sh
+++ b/t/precious.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/prefix.sh b/t/prefix.sh
index 29383084f..f08c54592 100644
--- a/t/prefix.sh
+++ b/t/prefix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/preproc-basics.sh b/t/preproc-basics.sh
index fb5122d92..300199efb 100644
--- a/t/preproc-basics.sh
+++ b/t/preproc-basics.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/preproc-c-compile.sh b/t/preproc-c-compile.sh
index c71322dbb..9df585d73 100644
--- a/t/preproc-c-compile.sh
+++ b/t/preproc-c-compile.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/preproc-demo.sh b/t/preproc-demo.sh
index 660bc0e22..226a6d02a 100644
--- a/t/preproc-demo.sh
+++ b/t/preproc-demo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/preproc-errmsg.sh b/t/preproc-errmsg.sh
index ea99076ac..0a660b6a1 100644
--- a/t/preproc-errmsg.sh
+++ b/t/preproc-errmsg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/primary-prefix-couples-documented-valid.sh b/t/primary-prefix-couples-documented-valid.sh
index d780e3b4e..2e290bade 100644
--- a/t/primary-prefix-couples-documented-valid.sh
+++ b/t/primary-prefix-couples-documented-valid.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/primary-prefix-couples-force-valid.sh b/t/primary-prefix-couples-force-valid.sh
index 450ac9474..a7da65dcb 100644
--- a/t/primary-prefix-couples-force-valid.sh
+++ b/t/primary-prefix-couples-force-valid.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/primary-prefix-invalid-couples.tap b/t/primary-prefix-invalid-couples.tap
index 4c865207e..ff82342af 100644
--- a/t/primary-prefix-invalid-couples.tap
+++ b/t/primary-prefix-invalid-couples.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/primary-prefix-valid-couples.sh b/t/primary-prefix-valid-couples.sh
index b2c502730..d8c451290 100644
--- a/t/primary-prefix-valid-couples.sh
+++ b/t/primary-prefix-valid-couples.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/primary.sh b/t/primary.sh
index 821ca9c13..166a6f1f2 100644
--- a/t/primary.sh
+++ b/t/primary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/primary2.sh b/t/primary2.sh
index fa6f64649..f23a11b05 100644
--- a/t/primary2.sh
+++ b/t/primary2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/primary3.sh b/t/primary3.sh
index f98e91d82..647fbf7ee 100644
--- a/t/primary3.sh
+++ b/t/primary3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/print-libdir.sh b/t/print-libdir.sh
index abe3487a1..e8aeb7f1c 100644
--- a/t/print-libdir.sh
+++ b/t/print-libdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/proginst.sh b/t/proginst.sh
index 24d821770..e3b9db7cb 100644
--- a/t/proginst.sh
+++ b/t/proginst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/programs-primary-rewritten.sh b/t/programs-primary-rewritten.sh
index 7c5910520..208ef1188 100644
--- a/t/programs-primary-rewritten.sh
+++ b/t/programs-primary-rewritten.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh
index 4ec7ff4d3..3b08b5a43 100644
--- a/t/py-compile-basedir.sh
+++ b/t/py-compile-basedir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/py-compile-basic.sh b/t/py-compile-basic.sh
index a84963df5..600e08d9c 100644
--- a/t/py-compile-basic.sh
+++ b/t/py-compile-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh
index 4f5de7d89..9b4c22e4d 100644
--- a/t/py-compile-destdir.sh
+++ b/t/py-compile-destdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/py-compile-env.sh b/t/py-compile-env.sh
index 7c39372d0..da5e75f93 100644
--- a/t/py-compile-env.sh
+++ b/t/py-compile-env.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/py-compile-option-terminate.sh b/t/py-compile-option-terminate.sh
index 4953f4fb2..502564b5f 100644
--- a/t/py-compile-option-terminate.sh
+++ b/t/py-compile-option-terminate.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/py-compile-usage.sh b/t/py-compile-usage.sh
index c2b2e2829..fc5d001ca 100644
--- a/t/py-compile-usage.sh
+++ b/t/py-compile-usage.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/python-am-path-iftrue.sh b/t/python-am-path-iftrue.sh
index 077ef3109..cc6443898 100644
--- a/t/python-am-path-iftrue.sh
+++ b/t/python-am-path-iftrue.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/python-dist.sh b/t/python-dist.sh
index 55a14928c..856b63425 100644
--- a/t/python-dist.sh
+++ b/t/python-dist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/python-missing.sh b/t/python-missing.sh
index 159e41868..4567ed291 100644
--- a/t/python-missing.sh
+++ b/t/python-missing.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/python-pr10995.sh b/t/python-pr10995.sh
index c6a2ce654..ff60755b0 100644
--- a/t/python-pr10995.sh
+++ b/t/python-pr10995.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/python-too-old.sh b/t/python-too-old.sh
index 9db5fc0b0..97e5337b0 100644
--- a/t/python-too-old.sh
+++ b/t/python-too-old.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/python-vars.sh b/t/python-vars.sh
index 532743b4b..d2b7b5ba3 100644
--- a/t/python-vars.sh
+++ b/t/python-vars.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh
index f356488be..0798ce786 100644
--- a/t/python-virtualenv.sh
+++ b/t/python-virtualenv.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/python.sh b/t/python.sh
index 3205857de..be8851869 100644
--- a/t/python.sh
+++ b/t/python.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/python10.sh b/t/python10.sh
index 4f428d98b..9074f79ec 100644
--- a/t/python10.sh
+++ b/t/python10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/python11.sh b/t/python11.sh
index 3501d9a56..349673396 100644
--- a/t/python11.sh
+++ b/t/python11.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/python12.sh b/t/python12.sh
index e84e76575..f5153aafe 100644
--- a/t/python12.sh
+++ b/t/python12.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/python2.sh b/t/python2.sh
index 5584a8786..f59e108fa 100644
--- a/t/python2.sh
+++ b/t/python2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/python3.sh b/t/python3.sh
index b2e19b434..b86ed91e1 100644
--- a/t/python3.sh
+++ b/t/python3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/recurs-user-deeply-nested.sh b/t/recurs-user-deeply-nested.sh
index 93d599f61..401d9e4d4 100644
--- a/t/recurs-user-deeply-nested.sh
+++ b/t/recurs-user-deeply-nested.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/recurs-user-indir.sh b/t/recurs-user-indir.sh
index ac9fce5a6..1ae6f712c 100644
--- a/t/recurs-user-indir.sh
+++ b/t/recurs-user-indir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/recurs-user-keep-going.sh b/t/recurs-user-keep-going.sh
index ec8be7764..f1b879d70 100644
--- a/t/recurs-user-keep-going.sh
+++ b/t/recurs-user-keep-going.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/recurs-user-many.sh b/t/recurs-user-many.sh
index ec1381d75..989299e7b 100644
--- a/t/recurs-user-many.sh
+++ b/t/recurs-user-many.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/recurs-user-no-subdirs.sh b/t/recurs-user-no-subdirs.sh
index 2fead196d..b3398bd07 100644
--- a/t/recurs-user-no-subdirs.sh
+++ b/t/recurs-user-no-subdirs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/recurs-user-no-top-level.sh b/t/recurs-user-no-top-level.sh
index 05913e31c..6975be92e 100644
--- a/t/recurs-user-no-top-level.sh
+++ b/t/recurs-user-no-top-level.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/recurs-user-override.sh b/t/recurs-user-override.sh
index eb68bd6f4..b4e98f397 100644
--- a/t/recurs-user-override.sh
+++ b/t/recurs-user-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/recurs-user-phony.sh b/t/recurs-user-phony.sh
index c637efd73..dd4d19562 100644
--- a/t/recurs-user-phony.sh
+++ b/t/recurs-user-phony.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/recurs-user-wrap.sh b/t/recurs-user-wrap.sh
index bff2bece3..70339afb1 100644
--- a/t/recurs-user-wrap.sh
+++ b/t/recurs-user-wrap.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/recurs-user.sh b/t/recurs-user.sh
index 783c00876..310fd408e 100644
--- a/t/recurs-user.sh
+++ b/t/recurs-user.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/recurs-user2.sh b/t/recurs-user2.sh
index 0e0b139ad..5090e045e 100644
--- a/t/recurs-user2.sh
+++ b/t/recurs-user2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/relativize.tap b/t/relativize.tap
index 1bbeb8c1e..b65a1c0de 100644
--- a/t/relativize.tap
+++ b/t/relativize.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/remake-aclocal-version-mismatch.sh b/t/remake-aclocal-version-mismatch.sh
index 534a65104..c8c90c8ef 100644
--- a/t/remake-aclocal-version-mismatch.sh
+++ b/t/remake-aclocal-version-mismatch.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/remake-after-acinclude-m4.sh b/t/remake-after-acinclude-m4.sh
index 67847bfc6..5795080a6 100644
--- a/t/remake-after-acinclude-m4.sh
+++ b/t/remake-after-acinclude-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-after-aclocal-m4.sh b/t/remake-after-aclocal-m4.sh
index 158bfe7a7..d955a40e7 100644
--- a/t/remake-after-aclocal-m4.sh
+++ b/t/remake-after-aclocal-m4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-after-configure-ac.sh b/t/remake-after-configure-ac.sh
index f74801cfa..d598f2294 100644
--- a/t/remake-after-configure-ac.sh
+++ b/t/remake-after-configure-ac.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-after-makefile-am.sh b/t/remake-after-makefile-am.sh
index 543cc7352..a758277f2 100644
--- a/t/remake-after-makefile-am.sh
+++ b/t/remake-after-makefile-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-all-1.sh b/t/remake-all-1.sh
index 151a73c3d..b4e4a9a32 100644
--- a/t/remake-all-1.sh
+++ b/t/remake-all-1.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-all-2.sh b/t/remake-all-2.sh
index 9a7f0ee89..4d94e8e05 100644
--- a/t/remake-all-2.sh
+++ b/t/remake-all-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-am-pr10111.sh b/t/remake-am-pr10111.sh
index 24e8b4cc2..3a7695e26 100644
--- a/t/remake-am-pr10111.sh
+++ b/t/remake-am-pr10111.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-config-status-dependencies.sh b/t/remake-config-status-dependencies.sh
index ed57691a0..7eeaa2673 100644
--- a/t/remake-config-status-dependencies.sh
+++ b/t/remake-config-status-dependencies.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/remake-configure-dependencies.sh b/t/remake-configure-dependencies.sh
index 3cc435a24..abbee9cc6 100644
--- a/t/remake-configure-dependencies.sh
+++ b/t/remake-configure-dependencies.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/remake-deeply-nested.sh b/t/remake-deeply-nested.sh
index 2e54b7d49..7351a5a73 100644
--- a/t/remake-deeply-nested.sh
+++ b/t/remake-deeply-nested.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-deleted-am-2.sh b/t/remake-deleted-am-2.sh
index 6c76d69fa..e2ea711a8 100644
--- a/t/remake-deleted-am-2.sh
+++ b/t/remake-deleted-am-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-deleted-am-subdir.sh b/t/remake-deleted-am-subdir.sh
index 89cf0b2ca..9f5dda46b 100644
--- a/t/remake-deleted-am-subdir.sh
+++ b/t/remake-deleted-am-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-deleted-am.sh b/t/remake-deleted-am.sh
index 6e2e6f0cf..cc5363081 100644
--- a/t/remake-deleted-am.sh
+++ b/t/remake-deleted-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-deleted-m4-file.sh b/t/remake-deleted-m4-file.sh
index 2c3cafa53..72ba9ff17 100644
--- a/t/remake-deleted-m4-file.sh
+++ b/t/remake-deleted-m4-file.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-fail.sh b/t/remake-fail.sh
index 92896e03c..ed1b64c6a 100644
--- a/t/remake-fail.sh
+++ b/t/remake-fail.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/remake-gnulib-add-acsubst.sh b/t/remake-gnulib-add-acsubst.sh
index 4d51583ad..19508a567 100644
--- a/t/remake-gnulib-add-acsubst.sh
+++ b/t/remake-gnulib-add-acsubst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-gnulib-add-header.sh b/t/remake-gnulib-add-header.sh
index 544ad0304..51190a274 100644
--- a/t/remake-gnulib-add-header.sh
+++ b/t/remake-gnulib-add-header.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-gnulib-remove-header.sh b/t/remake-gnulib-remove-header.sh
index 52a40c3ce..36f5e2f71 100644
--- a/t/remake-gnulib-remove-header.sh
+++ b/t/remake-gnulib-remove-header.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-include-aclocal.sh b/t/remake-include-aclocal.sh
index bd0257093..6d476dc0e 100644
--- a/t/remake-include-aclocal.sh
+++ b/t/remake-include-aclocal.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-include-configure.sh b/t/remake-include-configure.sh
index 96eb630d4..58c81de95 100644
--- a/t/remake-include-configure.sh
+++ b/t/remake-include-configure.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-include-makefile.sh b/t/remake-include-makefile.sh
index 9caae50ca..c551d726d 100644
--- a/t/remake-include-makefile.sh
+++ b/t/remake-include-makefile.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-m4-pr10111.sh b/t/remake-m4-pr10111.sh
index 46cd7b9af..c7fb2852e 100644
--- a/t/remake-m4-pr10111.sh
+++ b/t/remake-m4-pr10111.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-macrodir.sh b/t/remake-macrodir.sh
index ccb89301a..2c1f92593 100644
--- a/t/remake-macrodir.sh
+++ b/t/remake-macrodir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/remake-maintainer-mode.sh b/t/remake-maintainer-mode.sh
index e5da998f8..afd2c1256 100644
--- a/t/remake-maintainer-mode.sh
+++ b/t/remake-maintainer-mode.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/remake-makefile-intree.sh b/t/remake-makefile-intree.sh
index ff54e6580..990f113d9 100644
--- a/t/remake-makefile-intree.sh
+++ b/t/remake-makefile-intree.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-makefile-vpath.sh b/t/remake-makefile-vpath.sh
index 85fcc2357..596329061 100644
--- a/t/remake-makefile-vpath.sh
+++ b/t/remake-makefile-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-mild-stress.sh b/t/remake-mild-stress.sh
index 01876e930..e5d88a242 100644
--- a/t/remake-mild-stress.sh
+++ b/t/remake-mild-stress.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-moved-m4-file.sh b/t/remake-moved-m4-file.sh
index fd37cbbbd..74fbd7fa3 100644
--- a/t/remake-moved-m4-file.sh
+++ b/t/remake-moved-m4-file.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-not-after-make-dist.sh b/t/remake-not-after-make-dist.sh
index f2b9ed302..d8a5b5b8c 100644
--- a/t/remake-not-after-make-dist.sh
+++ b/t/remake-not-after-make-dist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/remake-recurs-user.sh b/t/remake-recurs-user.sh
index eff1aba13..b8b60bbf4 100644
--- a/t/remake-recurs-user.sh
+++ b/t/remake-recurs-user.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/remake-renamed-am.sh b/t/remake-renamed-am.sh
index ca932a692..7f0e200df 100644
--- a/t/remake-renamed-am.sh
+++ b/t/remake-renamed-am.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-renamed-m4-file.sh b/t/remake-renamed-m4-file.sh
index c71f0a6ab..45a771376 100644
--- a/t/remake-renamed-m4-file.sh
+++ b/t/remake-renamed-m4-file.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-renamed-m4-macro-and-file.sh b/t/remake-renamed-m4-macro-and-file.sh
index 66910453b..b7a7f4d24 100644
--- a/t/remake-renamed-m4-macro-and-file.sh
+++ b/t/remake-renamed-m4-macro-and-file.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-renamed-m4-macro.sh b/t/remake-renamed-m4-macro.sh
index 71150ffbf..c81a30ab2 100644
--- a/t/remake-renamed-m4-macro.sh
+++ b/t/remake-renamed-m4-macro.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-subdir-from-subdir.sh b/t/remake-subdir-from-subdir.sh
index 003e823ba..977b66ecb 100644
--- a/t/remake-subdir-from-subdir.sh
+++ b/t/remake-subdir-from-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/remake-subdir-gnu.sh b/t/remake-subdir-gnu.sh
index ad4183fb9..19b35a0fe 100644
--- a/t/remake-subdir-gnu.sh
+++ b/t/remake-subdir-gnu.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-subdir-grepping.sh b/t/remake-subdir-grepping.sh
index a50844f16..bce74c77f 100644
--- a/t/remake-subdir-grepping.sh
+++ b/t/remake-subdir-grepping.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/remake-subdir-long-time.sh b/t/remake-subdir-long-time.sh
index 54fff99b7..b6937b0e0 100644
--- a/t/remake-subdir-long-time.sh
+++ b/t/remake-subdir-long-time.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-subdir-no-makefile.sh b/t/remake-subdir-no-makefile.sh
index fbea9d70b..7ec190285 100644
--- a/t/remake-subdir-no-makefile.sh
+++ b/t/remake-subdir-no-makefile.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-subdir-only.sh b/t/remake-subdir-only.sh
index 1b8ed584f..ad625d3a8 100644
--- a/t/remake-subdir-only.sh
+++ b/t/remake-subdir-only.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/remake-subdir.sh b/t/remake-subdir.sh
index 5d7eea350..eb85d9a0c 100644
--- a/t/remake-subdir.sh
+++ b/t/remake-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-subdir2.sh b/t/remake-subdir2.sh
index 5573bc09a..d62f22542 100644
--- a/t/remake-subdir2.sh
+++ b/t/remake-subdir2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/remake-subdir3.sh b/t/remake-subdir3.sh
index 4b745c38a..0b51db70f 100644
--- a/t/remake-subdir3.sh
+++ b/t/remake-subdir3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/remake-timing-bug-pr8365.sh b/t/remake-timing-bug-pr8365.sh
index c4408722e..f3fd57d2d 100644
--- a/t/remake-timing-bug-pr8365.sh
+++ b/t/remake-timing-bug-pr8365.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/repeated-options.sh b/t/repeated-options.sh
index 1347b471e..48fd6d832 100644
--- a/t/repeated-options.sh
+++ b/t/repeated-options.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/reqd2.sh b/t/reqd2.sh
index e06655527..600b6271b 100644
--- a/t/reqd2.sh
+++ b/t/reqd2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/rm-f-probe.sh b/t/rm-f-probe.sh
index faa2e0f81..81ff7b86e 100644
--- a/t/rm-f-probe.sh
+++ b/t/rm-f-probe.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/rulepat.sh b/t/rulepat.sh
index de2337547..030ab1479 100644
--- a/t/rulepat.sh
+++ b/t/rulepat.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/sanity.sh b/t/sanity.sh
index 774ecd85b..a2dc21926 100644
--- a/t/sanity.sh
+++ b/t/sanity.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/seenc.sh b/t/seenc.sh
index 7979dbbf8..c8f85e94b 100644
--- a/t/seenc.sh
+++ b/t/seenc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/self-check-cc-no-c-o.sh b/t/self-check-cc-no-c-o.sh
index d99f7a376..00ab2411a 100644
--- a/t/self-check-cc-no-c-o.sh
+++ b/t/self-check-cc-no-c-o.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/self-check-configure-help.sh b/t/self-check-configure-help.sh
index 1df96b0a1..cabef7572 100644
--- a/t/self-check-configure-help.sh
+++ b/t/self-check-configure-help.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/self-check-dir.tap b/t/self-check-dir.tap
index 31bad2957..8e3486924 100644
--- a/t/self-check-dir.tap
+++ b/t/self-check-dir.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/self-check-exit.tap b/t/self-check-exit.tap
index 104956e77..824badf0b 100644
--- a/t/self-check-exit.tap
+++ b/t/self-check-exit.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh
index db8864b84..c76944555 100644
--- a/t/self-check-explicit-skips.sh
+++ b/t/self-check-explicit-skips.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/self-check-is-blocked-signal.tap b/t/self-check-is-blocked-signal.tap
index d1cbfb2cb..0c17759e8 100644
--- a/t/self-check-is-blocked-signal.tap
+++ b/t/self-check-is-blocked-signal.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/self-check-is_newest.tap b/t/self-check-is_newest.tap
index d825fda42..95055181f 100644
--- a/t/self-check-is_newest.tap
+++ b/t/self-check-is_newest.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/self-check-me.tap b/t/self-check-me.tap
index c1469cc38..29328370e 100644
--- a/t/self-check-me.tap
+++ b/t/self-check-me.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/self-check-report.sh b/t/self-check-report.sh
index 904e748c7..a5cd17e04 100644
--- a/t/self-check-report.sh
+++ b/t/self-check-report.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/self-check-seq.tap b/t/self-check-seq.tap
index 516166707..734ad5d3a 100644
--- a/t/self-check-seq.tap
+++ b/t/self-check-seq.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/self-check-shell-no-trail-bslash.sh b/t/self-check-shell-no-trail-bslash.sh
index 72a5e6f9e..5003e2ef8 100644
--- a/t/self-check-shell-no-trail-bslash.sh
+++ b/t/self-check-shell-no-trail-bslash.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/self-check-unindent.tap b/t/self-check-unindent.tap
index d72bd3eab..c8c18809c 100644
--- a/t/self-check-unindent.tap
+++ b/t/self-check-unindent.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/serial-tests.sh b/t/serial-tests.sh
index fc4a7a088..91aa52e8d 100644
--- a/t/serial-tests.sh
+++ b/t/serial-tests.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/silent-c.sh b/t/silent-c.sh
index 36df20834..36e34a274 100644
--- a/t/silent-c.sh
+++ b/t/silent-c.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/silent-configsite.sh b/t/silent-configsite.sh
index 5661fe140..221368f0a 100644
--- a/t/silent-configsite.sh
+++ b/t/silent-configsite.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/silent-custom.sh b/t/silent-custom.sh
index 1bb86c98d..ac2c9823d 100644
--- a/t/silent-custom.sh
+++ b/t/silent-custom.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/silent-cxx.sh b/t/silent-cxx.sh
index 8f88099ed..58d32b990 100644
--- a/t/silent-cxx.sh
+++ b/t/silent-cxx.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/silent-f77.sh b/t/silent-f77.sh
index ac64a9f42..9199ae418 100644
--- a/t/silent-f77.sh
+++ b/t/silent-f77.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/silent-f90.sh b/t/silent-f90.sh
index ac66231df..5fbd8971a 100644
--- a/t/silent-f90.sh
+++ b/t/silent-f90.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/silent-gen.sh b/t/silent-gen.sh
index e2586ec0b..3de5a3e0c 100644
--- a/t/silent-gen.sh
+++ b/t/silent-gen.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/silent-lex.sh b/t/silent-lex.sh
index 9e7904d72..9fda9bafa 100644
--- a/t/silent-lex.sh
+++ b/t/silent-lex.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/silent-lt.sh b/t/silent-lt.sh
index 3548ad4fe..bd6bf7039 100644
--- a/t/silent-lt.sh
+++ b/t/silent-lt.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/silent-many-languages.sh b/t/silent-many-languages.sh
index be0f61366..daab9eee3 100644
--- a/t/silent-many-languages.sh
+++ b/t/silent-many-languages.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/silent-nested-vars.sh b/t/silent-nested-vars.sh
index 22a6f01b5..321bf4c67 100644
--- a/t/silent-nested-vars.sh
+++ b/t/silent-nested-vars.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/silent-texi.sh b/t/silent-texi.sh
index 7dc5c432a..9e6ae3960 100644
--- a/t/silent-texi.sh
+++ b/t/silent-texi.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh
index 0bc1e50f4..ff3ea3678 100644
--- a/t/silent-yacc-headers.sh
+++ b/t/silent-yacc-headers.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh
index cece7c0da..48a4bd809 100644
--- a/t/silent-yacc.sh
+++ b/t/silent-yacc.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/space.sh b/t/space.sh
index b07527069..43698ff93 100644
--- a/t/space.sh
+++ b/t/space.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/t/specflg-dummy.sh b/t/specflg-dummy.sh
index e4678b990..f32e9d892 100644
--- a/t/specflg-dummy.sh
+++ b/t/specflg-dummy.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/specflg6.sh b/t/specflg6.sh
index bb3499a40..c95322a3a 100644
--- a/t/specflg6.sh
+++ b/t/specflg6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/specflg7.sh b/t/specflg7.sh
index 275fed53e..d226ba83c 100644
--- a/t/specflg7.sh
+++ b/t/specflg7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/specflg8.sh b/t/specflg8.sh
index b7b62ea62..46d167b42 100644
--- a/t/specflg8.sh
+++ b/t/specflg8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/specflg9.sh b/t/specflg9.sh
index 3fd0d8e69..49218a5b8 100644
--- a/t/specflg9.sh
+++ b/t/specflg9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/spell.sh b/t/spell.sh
index 593de583a..1d926abc6 100644
--- a/t/spell.sh
+++ b/t/spell.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/spell2.sh b/t/spell2.sh
index ef6a27eff..adc182447 100644
--- a/t/spell2.sh
+++ b/t/spell2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/spell3.sh b/t/spell3.sh
index d594e348f..b6f0ef37e 100644
--- a/t/spell3.sh
+++ b/t/spell3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/spelling.sh b/t/spelling.sh
index c45540bc0..e53ab6ef0 100644
--- a/t/spelling.sh
+++ b/t/spelling.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/spy-double-colon.sh b/t/spy-double-colon.sh
index ea4714850..f7b46c5a7 100644
--- a/t/spy-double-colon.sh
+++ b/t/spy-double-colon.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/spy-rm.tap b/t/spy-rm.tap
index b75389c03..0d9dee947 100644
--- a/t/spy-rm.tap
+++ b/t/spy-rm.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/src-acsubst.sh b/t/src-acsubst.sh
index 85d64c10a..c8a736601 100644
--- a/t/src-acsubst.sh
+++ b/t/src-acsubst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/stamph2.sh b/t/stamph2.sh
index 3d0096496..734ea000d 100644
--- a/t/stamph2.sh
+++ b/t/stamph2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/stdinc.sh b/t/stdinc.sh
index b8efeec68..0c7e9441a 100644
--- a/t/stdinc.sh
+++ b/t/stdinc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2017 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
diff --git a/t/stdlib.sh b/t/stdlib.sh
index 3a1f00c1d..6b6dc3b4d 100644
--- a/t/stdlib.sh
+++ b/t/stdlib.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/stdlib2.sh b/t/stdlib2.sh
index 52a265523..4e37f8f82 100644
--- a/t/stdlib2.sh
+++ b/t/stdlib2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/strictness-override.sh b/t/strictness-override.sh
index ed2768700..d3979787a 100644
--- a/t/strictness-override.sh
+++ b/t/strictness-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/strictness-precedence.sh b/t/strictness-precedence.sh
index 7bd7536f7..96ab032ba 100644
--- a/t/strictness-precedence.sh
+++ b/t/strictness-precedence.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/strip.sh b/t/strip.sh
index cfd6fb8ea..214f3dfc8 100644
--- a/t/strip.sh
+++ b/t/strip.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/strip2.sh b/t/strip2.sh
index 025d92fc6..5edb5d860 100644
--- a/t/strip2.sh
+++ b/t/strip2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/strip3.sh b/t/strip3.sh
index 3b383eae0..51656fd45 100644
--- a/t/strip3.sh
+++ b/t/strip3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/subdir-ac-subst.sh b/t/subdir-ac-subst.sh
index 0c07d6822..d49bc5708 100644
--- a/t/subdir-ac-subst.sh
+++ b/t/subdir-ac-subst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/subdir-add-pr46.sh b/t/subdir-add-pr46.sh
index 36ac63a21..3d37f0db6 100644
--- a/t/subdir-add-pr46.sh
+++ b/t/subdir-add-pr46.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/subdir-add2-pr46.sh b/t/subdir-add2-pr46.sh
index a513e248c..c1402bd81 100644
--- a/t/subdir-add2-pr46.sh
+++ b/t/subdir-add2-pr46.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/subdir-am-cond.sh b/t/subdir-am-cond.sh
index 8d37f1242..dc7ceed02 100644
--- a/t/subdir-am-cond.sh
+++ b/t/subdir-am-cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/subdir-cond-err.sh b/t/subdir-cond-err.sh
index 4558f774e..358691fc6 100644
--- a/t/subdir-cond-err.sh
+++ b/t/subdir-cond-err.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/subdir-cond-gettext.sh b/t/subdir-cond-gettext.sh
index f793240f8..5f29ecedd 100644
--- a/t/subdir-cond-gettext.sh
+++ b/t/subdir-cond-gettext.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/subdir-distclean.sh b/t/subdir-distclean.sh
index f09f3b320..452d488fd 100644
--- a/t/subdir-distclean.sh
+++ b/t/subdir-distclean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/subdir-env-interference.sh b/t/subdir-env-interference.sh
index 12b4a4a40..0a75a36ae 100644
--- a/t/subdir-env-interference.sh
+++ b/t/subdir-env-interference.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/subdir-keep-going-pr12554.sh b/t/subdir-keep-going-pr12554.sh
index a0592f52c..736575392 100644
--- a/t/subdir-keep-going-pr12554.sh
+++ b/t/subdir-keep-going-pr12554.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/subdir-order.sh b/t/subdir-order.sh
index 10ba9a797..56dd42b22 100644
--- a/t/subdir-order.sh
+++ b/t/subdir-order.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/subdir-subsub.sh b/t/subdir-subsub.sh
index 7c8e1d654..c9560d688 100644
--- a/t/subdir-subsub.sh
+++ b/t/subdir-subsub.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/subdir-with-slash.sh b/t/subdir-with-slash.sh
index 7ffcfce6c..38fe3dbc9 100644
--- a/t/subdir-with-slash.sh
+++ b/t/subdir-with-slash.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/subdir.sh b/t/subdir.sh
index 421d6b9d9..f8318e5b7 100644
--- a/t/subdir.sh
+++ b/t/subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh
index 72442742b..f911bed2a 100644
--- a/t/subobj-clean-lt-pr10697.sh
+++ b/t/subobj-clean-lt-pr10697.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh
index 0ce875fa6..c21263327 100644
--- a/t/subobj-clean-pr10697.sh
+++ b/t/subobj-clean-pr10697.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/subobj-indir-pr13928.sh b/t/subobj-indir-pr13928.sh
index 9a7116d35..6564607d5 100644
--- a/t/subobj-indir-pr13928.sh
+++ b/t/subobj-indir-pr13928.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/subobj-pr13928-more-langs.sh b/t/subobj-pr13928-more-langs.sh
index 323e24899..6d45afe38 100644
--- a/t/subobj-pr13928-more-langs.sh
+++ b/t/subobj-pr13928-more-langs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2015-2017 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
diff --git a/t/subobj-vpath-pr13928.sh b/t/subobj-vpath-pr13928.sh
index a7db9d8ad..9af7502bf 100644
--- a/t/subobj-vpath-pr13928.sh
+++ b/t/subobj-vpath-pr13928.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/subobj.sh b/t/subobj.sh
index 9b5babfbf..dee2c2285 100644
--- a/t/subobj.sh
+++ b/t/subobj.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/subobj10.sh b/t/subobj10.sh
index 9c2197628..a027ad0f1 100644
--- a/t/subobj10.sh
+++ b/t/subobj10.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/subobj11a.sh b/t/subobj11a.sh
index 6fc9ceea2..b3547f81a 100644
--- a/t/subobj11a.sh
+++ b/t/subobj11a.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/subobj11b.sh b/t/subobj11b.sh
index 12e2216d2..d28ab4b85 100644
--- a/t/subobj11b.sh
+++ b/t/subobj11b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/subobj11c.sh b/t/subobj11c.sh
index 79abef96c..36bbf9c5f 100644
--- a/t/subobj11c.sh
+++ b/t/subobj11c.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/subobj2.sh b/t/subobj2.sh
index e80fe7735..4a0bce552 100644
--- a/t/subobj2.sh
+++ b/t/subobj2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/subobj5.sh b/t/subobj5.sh
index c57e7846c..46efa0cf6 100644
--- a/t/subobj5.sh
+++ b/t/subobj5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/subobj6.sh b/t/subobj6.sh
index c1d1a794e..65976d95e 100644
--- a/t/subobj6.sh
+++ b/t/subobj6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/subobj7.sh b/t/subobj7.sh
index fa4bd0a86..3c6769884 100644
--- a/t/subobj7.sh
+++ b/t/subobj7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/subobj8.sh b/t/subobj8.sh
index a39aac889..672093138 100644
--- a/t/subobj8.sh
+++ b/t/subobj8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/subobj9.sh b/t/subobj9.sh
index 7e20eac02..3566b6178 100644
--- a/t/subobj9.sh
+++ b/t/subobj9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/subobjname.sh b/t/subobjname.sh
index d588b96f6..17521a47c 100644
--- a/t/subobjname.sh
+++ b/t/subobjname.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/subpkg-macrodir.sh b/t/subpkg-macrodir.sh
index 0e0f95d31..cb8240433 100644
--- a/t/subpkg-macrodir.sh
+++ b/t/subpkg-macrodir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/subpkg-yacc.sh b/t/subpkg-yacc.sh
index 87a1b3e91..4c49b80ac 100644
--- a/t/subpkg-yacc.sh
+++ b/t/subpkg-yacc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/subpkg.sh b/t/subpkg.sh
index ccae9a84d..7c16b1959 100644
--- a/t/subpkg.sh
+++ b/t/subpkg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/subpkg2.sh b/t/subpkg2.sh
index 9e87fd075..c3ff9d6b6 100644
--- a/t/subpkg2.sh
+++ b/t/subpkg2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/subpkg3.sh b/t/subpkg3.sh
index 64c2a442e..3223fa899 100644
--- a/t/subpkg3.sh
+++ b/t/subpkg3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/subpkg4.sh b/t/subpkg4.sh
index 777d78e2b..76a4ed08d 100644
--- a/t/subpkg4.sh
+++ b/t/subpkg4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/subst-no-trailing-empty-line.sh b/t/subst-no-trailing-empty-line.sh
index 1bf7798f6..3f29be34f 100644
--- a/t/subst-no-trailing-empty-line.sh
+++ b/t/subst-no-trailing-empty-line.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/subst.sh b/t/subst.sh
index 61310e8d1..8cb29f420 100644
--- a/t/subst.sh
+++ b/t/subst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/subst3.sh b/t/subst3.sh
index 42718208b..9e3d83bbf 100644
--- a/t/subst3.sh
+++ b/t/subst3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/subst4.sh b/t/subst4.sh
index 32335edcd..a0b61a515 100644
--- a/t/subst4.sh
+++ b/t/subst4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/subst5.sh b/t/subst5.sh
index b29b0656c..b38dfb4c3 100644
--- a/t/subst5.sh
+++ b/t/subst5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/substre2.sh b/t/substre2.sh
index 5f006db85..f7b1edddb 100644
--- a/t/substre2.sh
+++ b/t/substre2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/substref.sh b/t/substref.sh
index 41f4e1912..5a9f027ef 100644
--- a/t/substref.sh
+++ b/t/substref.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/substtarg.sh b/t/substtarg.sh
index f1f76a4aa..bb5be8331 100644
--- a/t/substtarg.sh
+++ b/t/substtarg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/suffix-chain.tap b/t/suffix-chain.tap
index f6c5cd33a..303f3073e 100644
--- a/t/suffix-chain.tap
+++ b/t/suffix-chain.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/suffix-custom-pr14441.sh b/t/suffix-custom-pr14441.sh
index 7c663da24..78805e913 100644
--- a/t/suffix-custom-pr14441.sh
+++ b/t/suffix-custom-pr14441.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/suffix-custom-subobj-and-specflg.sh b/t/suffix-custom-subobj-and-specflg.sh
index 2ccb9dc8b..dbb7b6f9e 100644
--- a/t/suffix-custom-subobj-and-specflg.sh
+++ b/t/suffix-custom-subobj-and-specflg.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/suffix-custom-subobj.sh b/t/suffix-custom-subobj.sh
index f0011cd56..ce44af961 100644
--- a/t/suffix-custom-subobj.sh
+++ b/t/suffix-custom-subobj.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/suffix-extra-c-stuff-pr14560.sh b/t/suffix-extra-c-stuff-pr14560.sh
index 653030c7a..b9fd14431 100644
--- a/t/suffix-extra-c-stuff-pr14560.sh
+++ b/t/suffix-extra-c-stuff-pr14560.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/suffix.sh b/t/suffix.sh
index 860b8fa4e..f2196aa30 100644
--- a/t/suffix.sh
+++ b/t/suffix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/suffix10.tap b/t/suffix10.tap
index 482504b97..0b3133d80 100644
--- a/t/suffix10.tap
+++ b/t/suffix10.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/suffix11.tap b/t/suffix11.tap
index 4a0b606e1..02b732f76 100644
--- a/t/suffix11.tap
+++ b/t/suffix11.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/suffix2.sh b/t/suffix2.sh
index de953b999..b64ab2890 100644
--- a/t/suffix2.sh
+++ b/t/suffix2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/suffix3.tap b/t/suffix3.tap
index c1bcd4794..7cbb90f04 100644
--- a/t/suffix3.tap
+++ b/t/suffix3.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/suffix4.sh b/t/suffix4.sh
index e06c8621c..11dbb007e 100644
--- a/t/suffix4.sh
+++ b/t/suffix4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/suffix5.sh b/t/suffix5.sh
index be3cbbbdb..c5168d9e7 100644
--- a/t/suffix5.sh
+++ b/t/suffix5.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/suffix6.sh b/t/suffix6.sh
index db92f32a3..7bdde3d52 100644
--- a/t/suffix6.sh
+++ b/t/suffix6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/suffix6b.sh b/t/suffix6b.sh
index b6fb03205..0fd83c632 100644
--- a/t/suffix6b.sh
+++ b/t/suffix6b.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/suffix6c.sh b/t/suffix6c.sh
index 01692e440..83dd1b164 100644
--- a/t/suffix6c.sh
+++ b/t/suffix6c.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/suffix7.sh b/t/suffix7.sh
index 4ef4aa239..21c677281 100644
--- a/t/suffix7.sh
+++ b/t/suffix7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/suffix8.tap b/t/suffix8.tap
index 18aef842f..21e059d51 100644
--- a/t/suffix8.tap
+++ b/t/suffix8.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/suffix9.sh b/t/suffix9.sh
index 9282cc58a..ab22aa967 100644
--- a/t/suffix9.sh
+++ b/t/suffix9.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/symlink.sh b/t/symlink.sh
index 6713fb21d..8b88f566e 100644
--- a/t/symlink.sh
+++ b/t/symlink.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/symlink2.sh b/t/symlink2.sh
index 3bf8a6e2d..7f05c0ed8 100644
--- a/t/symlink2.sh
+++ b/t/symlink2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/t/syntax.sh b/t/syntax.sh
index e3fb329e5..f6887f42c 100644
--- a/t/syntax.sh
+++ b/t/syntax.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/tags-pr12372.sh b/t/tags-pr12372.sh
index 731c41926..a67bb95b4 100644
--- a/t/tags-pr12372.sh
+++ b/t/tags-pr12372.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/tags.sh b/t/tags.sh
index 30f21582e..9cf53df76 100644
--- a/t/tags.sh
+++ b/t/tags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/tags2.sh b/t/tags2.sh
index e5be4fe83..7a3811dff 100644
--- a/t/tags2.sh
+++ b/t/tags2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/tagsub.sh b/t/tagsub.sh
index 71a8d96b5..37f585bae 100644
--- a/t/tagsub.sh
+++ b/t/tagsub.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/tap-ambiguous-directive.sh b/t/tap-ambiguous-directive.sh
index d91f0b759..8f5c827bd 100644
--- a/t/tap-ambiguous-directive.sh
+++ b/t/tap-ambiguous-directive.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-autonumber.sh b/t/tap-autonumber.sh
index a4ed72239..d5f14d541 100644
--- a/t/tap-autonumber.sh
+++ b/t/tap-autonumber.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-bad-prog.tap b/t/tap-bad-prog.tap
index 849ce5769..c00eab7ba 100644
--- a/t/tap-bad-prog.tap
+++ b/t/tap-bad-prog.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-bailout-and-logging.sh b/t/tap-bailout-and-logging.sh
index 081675de2..683a815d7 100644
--- a/t/tap-bailout-and-logging.sh
+++ b/t/tap-bailout-and-logging.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-bailout-leading-space.sh b/t/tap-bailout-leading-space.sh
index 36f78761a..cd08a6554 100644
--- a/t/tap-bailout-leading-space.sh
+++ b/t/tap-bailout-leading-space.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-bailout-suppress-badexit.sh b/t/tap-bailout-suppress-badexit.sh
index 24caa5f30..b08b5ee9d 100644
--- a/t/tap-bailout-suppress-badexit.sh
+++ b/t/tap-bailout-suppress-badexit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-bailout-suppress-later-diagnostic.sh b/t/tap-bailout-suppress-later-diagnostic.sh
index ca0930e4a..19316d93c 100644
--- a/t/tap-bailout-suppress-later-diagnostic.sh
+++ b/t/tap-bailout-suppress-later-diagnostic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-bailout-suppress-later-errors.sh b/t/tap-bailout-suppress-later-errors.sh
index 0dde34935..d50a26b26 100644
--- a/t/tap-bailout-suppress-later-errors.sh
+++ b/t/tap-bailout-suppress-later-errors.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-bailout.sh b/t/tap-bailout.sh
index 34c49fa68..76232512c 100644
--- a/t/tap-bailout.sh
+++ b/t/tap-bailout.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-basic.sh b/t/tap-basic.sh
index 63649a133..566e4c8bd 100644
--- a/t/tap-basic.sh
+++ b/t/tap-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-color.sh b/t/tap-color.sh
index 44e741d82..2ca453fcf 100644
--- a/t/tap-color.sh
+++ b/t/tap-color.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-common-setup.sh b/t/tap-common-setup.sh
index b15a414ea..ff4f3aca8 100644
--- a/t/tap-common-setup.sh
+++ b/t/tap-common-setup.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-deps.sh b/t/tap-deps.sh
index 3edac73a9..cdafec92b 100644
--- a/t/tap-deps.sh
+++ b/t/tap-deps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-diagnostic-custom.sh b/t/tap-diagnostic-custom.sh
index c95995b34..af779873c 100644
--- a/t/tap-diagnostic-custom.sh
+++ b/t/tap-diagnostic-custom.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-diagnostic.sh b/t/tap-diagnostic.sh
index 6bb2ee408..404f7fc99 100644
--- a/t/tap-diagnostic.sh
+++ b/t/tap-diagnostic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-doc.sh b/t/tap-doc.sh
index e1d9951d3..1b5b11325 100644
--- a/t/tap-doc.sh
+++ b/t/tap-doc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-doc2.sh b/t/tap-doc2.sh
index 4781d3cf3..48bce1e0c 100644
--- a/t/tap-doc2.sh
+++ b/t/tap-doc2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-driver-stderr.sh b/t/tap-driver-stderr.sh
index 450568444..6fa991e12 100644
--- a/t/tap-driver-stderr.sh
+++ b/t/tap-driver-stderr.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-empty-diagnostic.sh b/t/tap-empty-diagnostic.sh
index c7969032a..c88a06050 100644
--- a/t/tap-empty-diagnostic.sh
+++ b/t/tap-empty-diagnostic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-empty.sh b/t/tap-empty.sh
index 8dcb0cf05..56452f122 100644
--- a/t/tap-empty.sh
+++ b/t/tap-empty.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-escape-directive-2.sh b/t/tap-escape-directive-2.sh
index 67c101179..bbe318a61 100644
--- a/t/tap-escape-directive-2.sh
+++ b/t/tap-escape-directive-2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-escape-directive.sh b/t/tap-escape-directive.sh
index 82775a0f7..2bfcfa4d5 100644
--- a/t/tap-escape-directive.sh
+++ b/t/tap-escape-directive.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-exit.sh b/t/tap-exit.sh
index e1bb3f4c7..24de743e5 100644
--- a/t/tap-exit.sh
+++ b/t/tap-exit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-fancy.sh b/t/tap-fancy.sh
index 0f5cdfeb0..2602b268b 100644
--- a/t/tap-fancy.sh
+++ b/t/tap-fancy.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-fancy2.sh b/t/tap-fancy2.sh
index d9203b63a..678f9504f 100644
--- a/t/tap-fancy2.sh
+++ b/t/tap-fancy2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-global-log.sh b/t/tap-global-log.sh
index 7d8a3096f..05c9e53b4 100644
--- a/t/tap-global-log.sh
+++ b/t/tap-global-log.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-global-result.sh b/t/tap-global-result.sh
index 132e7b143..6fb572ba7 100644
--- a/t/tap-global-result.sh
+++ b/t/tap-global-result.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-log.sh b/t/tap-log.sh
index d75ac07a5..deae5f9eb 100644
--- a/t/tap-log.sh
+++ b/t/tap-log.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-merge-stdout-stderr.sh b/t/tap-merge-stdout-stderr.sh
index 7f70401c5..ff03d26ec 100644
--- a/t/tap-merge-stdout-stderr.sh
+++ b/t/tap-merge-stdout-stderr.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-missing-plan-and-bad-exit.sh b/t/tap-missing-plan-and-bad-exit.sh
index 7f5b741b7..bc268bf7a 100644
--- a/t/tap-missing-plan-and-bad-exit.sh
+++ b/t/tap-missing-plan-and-bad-exit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-more.sh b/t/tap-more.sh
index 37f11ab7c..64a9a49f5 100644
--- a/t/tap-more.sh
+++ b/t/tap-more.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-more2.sh b/t/tap-more2.sh
index fd09e8dde..fe945206b 100644
--- a/t/tap-more2.sh
+++ b/t/tap-more2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-msg0-bailout.sh b/t/tap-msg0-bailout.sh
index 65ca258ec..11632adb4 100644
--- a/t/tap-msg0-bailout.sh
+++ b/t/tap-msg0-bailout.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-msg0-directive.sh b/t/tap-msg0-directive.sh
index 6b5edbf9e..27196d5fd 100644
--- a/t/tap-msg0-directive.sh
+++ b/t/tap-msg0-directive.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-msg0-misc.sh b/t/tap-msg0-misc.sh
index 31d31855a..b3d4da4cf 100644
--- a/t/tap-msg0-misc.sh
+++ b/t/tap-msg0-misc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-msg0-planskip.sh b/t/tap-msg0-planskip.sh
index 9e75013ff..21c4db4d4 100644
--- a/t/tap-msg0-planskip.sh
+++ b/t/tap-msg0-planskip.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-msg0-result.sh b/t/tap-msg0-result.sh
index abc668ee8..36b5d15bd 100644
--- a/t/tap-msg0-result.sh
+++ b/t/tap-msg0-result.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-negative-numbers.sh b/t/tap-negative-numbers.sh
index c51e032d4..a436b1890 100644
--- a/t/tap-negative-numbers.sh
+++ b/t/tap-negative-numbers.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-no-disable-hard-error.sh b/t/tap-no-disable-hard-error.sh
index 193a03da1..e85c45012 100644
--- a/t/tap-no-disable-hard-error.sh
+++ b/t/tap-no-disable-hard-error.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-no-merge-stdout-stderr.sh b/t/tap-no-merge-stdout-stderr.sh
index 6dcf3c0db..a75f54d78 100644
--- a/t/tap-no-merge-stdout-stderr.sh
+++ b/t/tap-no-merge-stdout-stderr.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-no-spurious-numbers.sh b/t/tap-no-spurious-numbers.sh
index 1d11dafc7..d4a4c2507 100644
--- a/t/tap-no-spurious-numbers.sh
+++ b/t/tap-no-spurious-numbers.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-no-spurious-summary.sh b/t/tap-no-spurious-summary.sh
index dd18f0e2d..2b97fe996 100644
--- a/t/tap-no-spurious-summary.sh
+++ b/t/tap-no-spurious-summary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-no-spurious.sh b/t/tap-no-spurious.sh
index 7886d68d6..04394ff39 100644
--- a/t/tap-no-spurious.sh
+++ b/t/tap-no-spurious.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-not-ok-skip.sh b/t/tap-not-ok-skip.sh
index 20e2fca7d..1a9ad1192 100644
--- a/t/tap-not-ok-skip.sh
+++ b/t/tap-not-ok-skip.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-number-wordboundary.sh b/t/tap-number-wordboundary.sh
index 3e6af8935..5c2e7d48d 100644
--- a/t/tap-number-wordboundary.sh
+++ b/t/tap-number-wordboundary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-numbers-leading-zero.sh b/t/tap-numbers-leading-zero.sh
index 62416be56..b6f32b8b9 100644
--- a/t/tap-numbers-leading-zero.sh
+++ b/t/tap-numbers-leading-zero.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-numeric-description.sh b/t/tap-numeric-description.sh
index a53a22aac..5ad7b8524 100644
--- a/t/tap-numeric-description.sh
+++ b/t/tap-numeric-description.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-out-of-order.sh b/t/tap-out-of-order.sh
index 64bc0df4b..8741c88af 100644
--- a/t/tap-out-of-order.sh
+++ b/t/tap-out-of-order.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-passthrough-exit.sh b/t/tap-passthrough-exit.sh
index 876eab5de..6a8c0d45c 100644
--- a/t/tap-passthrough-exit.sh
+++ b/t/tap-passthrough-exit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-passthrough.sh b/t/tap-passthrough.sh
index 8385cd78e..59976c263 100644
--- a/t/tap-passthrough.sh
+++ b/t/tap-passthrough.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-plan-corner.sh b/t/tap-plan-corner.sh
index 79717300e..da217540e 100644
--- a/t/tap-plan-corner.sh
+++ b/t/tap-plan-corner.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-plan-errors.sh b/t/tap-plan-errors.sh
index b2bb11dd6..46832c533 100644
--- a/t/tap-plan-errors.sh
+++ b/t/tap-plan-errors.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-plan-leading-zero.sh b/t/tap-plan-leading-zero.sh
index 3aacf8d38..f3e9d8943 100644
--- a/t/tap-plan-leading-zero.sh
+++ b/t/tap-plan-leading-zero.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-plan-malformed.sh b/t/tap-plan-malformed.sh
index d2d5ab9fc..9800c0744 100644
--- a/t/tap-plan-malformed.sh
+++ b/t/tap-plan-malformed.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-plan-middle.sh b/t/tap-plan-middle.sh
index b120bae22..6474f15ae 100644
--- a/t/tap-plan-middle.sh
+++ b/t/tap-plan-middle.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-plan-whitespace.sh b/t/tap-plan-whitespace.sh
index 475183c1e..4d5ce6164 100644
--- a/t/tap-plan-whitespace.sh
+++ b/t/tap-plan-whitespace.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-plan.sh b/t/tap-plan.sh
index 6c3b9f501..5585e1b51 100644
--- a/t/tap-plan.sh
+++ b/t/tap-plan.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-planskip-and-logging.sh b/t/tap-planskip-and-logging.sh
index 42454708b..934e524af 100644
--- a/t/tap-planskip-and-logging.sh
+++ b/t/tap-planskip-and-logging.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-planskip-badexit.sh b/t/tap-planskip-badexit.sh
index 9e9c49fbc..c917b1948 100644
--- a/t/tap-planskip-badexit.sh
+++ b/t/tap-planskip-badexit.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-planskip-bailout.sh b/t/tap-planskip-bailout.sh
index 75a4441f0..93392e61f 100644
--- a/t/tap-planskip-bailout.sh
+++ b/t/tap-planskip-bailout.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-planskip-case-insensitive.sh b/t/tap-planskip-case-insensitive.sh
index cd5be5a39..2a83089da 100644
--- a/t/tap-planskip-case-insensitive.sh
+++ b/t/tap-planskip-case-insensitive.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-planskip-late.sh b/t/tap-planskip-late.sh
index 486677dab..befb2a123 100644
--- a/t/tap-planskip-late.sh
+++ b/t/tap-planskip-late.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-planskip-later-errors.sh b/t/tap-planskip-later-errors.sh
index 99c121f5e..9898572f1 100644
--- a/t/tap-planskip-later-errors.sh
+++ b/t/tap-planskip-later-errors.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-planskip-unplanned-corner.sh b/t/tap-planskip-unplanned-corner.sh
index afddd6562..382b26c2e 100644
--- a/t/tap-planskip-unplanned-corner.sh
+++ b/t/tap-planskip-unplanned-corner.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-planskip-unplanned.sh b/t/tap-planskip-unplanned.sh
index ad2c2f9ec..948a51850 100644
--- a/t/tap-planskip-unplanned.sh
+++ b/t/tap-planskip-unplanned.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-planskip-whitespace.sh b/t/tap-planskip-whitespace.sh
index 5104a155f..a90a1f990 100644
--- a/t/tap-planskip-whitespace.sh
+++ b/t/tap-planskip-whitespace.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-planskip.sh b/t/tap-planskip.sh
index bc6ba1b81..547edb6d8 100644
--- a/t/tap-planskip.sh
+++ b/t/tap-planskip.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-recheck-logs.sh b/t/tap-recheck-logs.sh
index 852547c7d..c1a3a3c67 100644
--- a/t/tap-recheck-logs.sh
+++ b/t/tap-recheck-logs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-recheck.sh b/t/tap-recheck.sh
index 0fd170adb..8e500b2fe 100644
--- a/t/tap-recheck.sh
+++ b/t/tap-recheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-result-comment.sh b/t/tap-result-comment.sh
index 8d225a18a..f5d46ffe2 100644
--- a/t/tap-result-comment.sh
+++ b/t/tap-result-comment.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-signal.tap b/t/tap-signal.tap
index 601b4ea08..c586e0b89 100644
--- a/t/tap-signal.tap
+++ b/t/tap-signal.tap
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-summary-color.sh b/t/tap-summary-color.sh
index 0223802a9..a424968d2 100644
--- a/t/tap-summary-color.sh
+++ b/t/tap-summary-color.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-summary.sh b/t/tap-summary.sh
index 2b2607059..55011199e 100644
--- a/t/tap-summary.sh
+++ b/t/tap-summary.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-test-number-0.sh b/t/tap-test-number-0.sh
index fa9b30510..a52c417db 100644
--- a/t/tap-test-number-0.sh
+++ b/t/tap-test-number-0.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-todo-skip-together.sh b/t/tap-todo-skip-together.sh
index 8784f9e31..9bbf56e8d 100644
--- a/t/tap-todo-skip-together.sh
+++ b/t/tap-todo-skip-together.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-todo-skip-whitespace.sh b/t/tap-todo-skip-whitespace.sh
index 797269429..73fe50482 100644
--- a/t/tap-todo-skip-whitespace.sh
+++ b/t/tap-todo-skip-whitespace.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-todo-skip.sh b/t/tap-todo-skip.sh
index d24603403..e5e5c3eb9 100644
--- a/t/tap-todo-skip.sh
+++ b/t/tap-todo-skip.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-unplanned.sh b/t/tap-unplanned.sh
index 3d3afedab..ea2a31b57 100644
--- a/t/tap-unplanned.sh
+++ b/t/tap-unplanned.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-whitespace-normalization.sh b/t/tap-whitespace-normalization.sh
index b23649e65..d9da56c91 100644
--- a/t/tap-whitespace-normalization.sh
+++ b/t/tap-whitespace-normalization.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-with-and-without-number.sh b/t/tap-with-and-without-number.sh
index bed8e25cc..cc00d51ae 100644
--- a/t/tap-with-and-without-number.sh
+++ b/t/tap-with-and-without-number.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tap-xfail-tests.sh b/t/tap-xfail-tests.sh
index df2d95aa1..9e9f5ce3a 100644
--- a/t/tap-xfail-tests.sh
+++ b/t/tap-xfail-tests.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tar-opts-errors.sh b/t/tar-opts-errors.sh
index 9a8270873..1217080b8 100644
--- a/t/tar-opts-errors.sh
+++ b/t/tar-opts-errors.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/tar-override.sh b/t/tar-override.sh
index c5f9e5af5..4c38f160c 100644
--- a/t/tar-override.sh
+++ b/t/tar-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tar-pax.sh b/t/tar-pax.sh
index 7ba0a369e..480e23d81 100644
--- a/t/tar-pax.sh
+++ b/t/tar-pax.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/tar-ustar-id-too-high.sh b/t/tar-ustar-id-too-high.sh
index c82056085..fdb4d7220 100644
--- a/t/tar-ustar-id-too-high.sh
+++ b/t/tar-ustar-id-too-high.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/tar-ustar.sh b/t/tar-ustar.sh
index ab6186287..a9074229c 100644
--- a/t/tar-ustar.sh
+++ b/t/tar-ustar.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/target-cflags.sh b/t/target-cflags.sh
index 049e71dfd..30435bd3f 100644
--- a/t/target-cflags.sh
+++ b/t/target-cflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 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
diff --git a/t/targetclash.sh b/t/targetclash.sh
index 2075a116c..dea195623 100644
--- a/t/targetclash.sh
+++ b/t/targetclash.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/test-driver-acsubst.sh b/t/test-driver-acsubst.sh
index 1d18ed6f9..ccc07ad2b 100644
--- a/t/test-driver-acsubst.sh
+++ b/t/test-driver-acsubst.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-driver-cond.sh b/t/test-driver-cond.sh
index 15dbb2c94..35cefbad6 100644
--- a/t/test-driver-cond.sh
+++ b/t/test-driver-cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-driver-create-log-dir.sh b/t/test-driver-create-log-dir.sh
index 80536ea0e..882ad2783 100644
--- a/t/test-driver-create-log-dir.sh
+++ b/t/test-driver-create-log-dir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-driver-custom-multitest-recheck.sh b/t/test-driver-custom-multitest-recheck.sh
index 1d0f258ef..aa7abedb2 100644
--- a/t/test-driver-custom-multitest-recheck.sh
+++ b/t/test-driver-custom-multitest-recheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-driver-custom-multitest-recheck2.sh b/t/test-driver-custom-multitest-recheck2.sh
index 53794a121..e94d96ad0 100644
--- a/t/test-driver-custom-multitest-recheck2.sh
+++ b/t/test-driver-custom-multitest-recheck2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-driver-custom-multitest.sh b/t/test-driver-custom-multitest.sh
index 45e5c6225..7e2017593 100644
--- a/t/test-driver-custom-multitest.sh
+++ b/t/test-driver-custom-multitest.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-driver-custom-no-extra-driver.sh b/t/test-driver-custom-no-extra-driver.sh
index 90f415d26..3212d4b5a 100644
--- a/t/test-driver-custom-no-extra-driver.sh
+++ b/t/test-driver-custom-no-extra-driver.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-driver-custom-xfail-tests.sh b/t/test-driver-custom-xfail-tests.sh
index 565bc441e..22d9809f1 100644
--- a/t/test-driver-custom-xfail-tests.sh
+++ b/t/test-driver-custom-xfail-tests.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-driver-custom.sh b/t/test-driver-custom.sh
index d12024576..84f65d111 100644
--- a/t/test-driver-custom.sh
+++ b/t/test-driver-custom.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-driver-fail.sh b/t/test-driver-fail.sh
index 8899edb86..db34f50c7 100644
--- a/t/test-driver-fail.sh
+++ b/t/test-driver-fail.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-driver-is-distributed.sh b/t/test-driver-is-distributed.sh
index b3b0301e8..c6817dde1 100644
--- a/t/test-driver-is-distributed.sh
+++ b/t/test-driver-is-distributed.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-driver-strip-vpath.sh b/t/test-driver-strip-vpath.sh
index b3a456521..27d2e131e 100644
--- a/t/test-driver-strip-vpath.sh
+++ b/t/test-driver-strip-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-driver-trs-suffix-registered.sh b/t/test-driver-trs-suffix-registered.sh
index e5570e8f5..ad190d23a 100644
--- a/t/test-driver-trs-suffix-registered.sh
+++ b/t/test-driver-trs-suffix-registered.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-extensions-cond.sh b/t/test-extensions-cond.sh
index fd6fba06d..b64a98ab1 100644
--- a/t/test-extensions-cond.sh
+++ b/t/test-extensions-cond.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-extensions.sh b/t/test-extensions.sh
index bf4f5f23d..2f058e7ba 100644
--- a/t/test-extensions.sh
+++ b/t/test-extensions.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-harness-vpath-rewrite.sh b/t/test-harness-vpath-rewrite.sh
index 7e47cdea0..82086ac10 100644
--- a/t/test-harness-vpath-rewrite.sh
+++ b/t/test-harness-vpath-rewrite.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/test-log.sh b/t/test-log.sh
index a1d085e6a..aa9a44917 100644
--- a/t/test-log.sh
+++ b/t/test-log.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-logs-repeated.sh b/t/test-logs-repeated.sh
index 47d4deed8..50e86fdd6 100644
--- a/t/test-logs-repeated.sh
+++ b/t/test-logs-repeated.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-metadata-global-log.sh b/t/test-metadata-global-log.sh
index e2104bedb..1e56cc3f9 100644
--- a/t/test-metadata-global-log.sh
+++ b/t/test-metadata-global-log.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-metadata-global-result.sh b/t/test-metadata-global-result.sh
index b194a1354..8e04a43df 100644
--- a/t/test-metadata-global-result.sh
+++ b/t/test-metadata-global-result.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-metadata-recheck.sh b/t/test-metadata-recheck.sh
index dfb1cf377..6156d861e 100644
--- a/t/test-metadata-recheck.sh
+++ b/t/test-metadata-recheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-metadata-results.sh b/t/test-metadata-results.sh
index adc7564d2..a8cdee4db 100644
--- a/t/test-metadata-results.sh
+++ b/t/test-metadata-results.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-missing.sh b/t/test-missing.sh
index 19e0666a4..3b4a35cbf 100644
--- a/t/test-missing.sh
+++ b/t/test-missing.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-missing2.sh b/t/test-missing2.sh
index b60305bdb..eee2eb794 100644
--- a/t/test-missing2.sh
+++ b/t/test-missing2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-trs-basic.sh b/t/test-trs-basic.sh
index 85b3fbbc6..9febf1d3a 100644
--- a/t/test-trs-basic.sh
+++ b/t/test-trs-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-trs-recover.sh b/t/test-trs-recover.sh
index d1a2459f0..182433ae5 100644
--- a/t/test-trs-recover.sh
+++ b/t/test-trs-recover.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/test-trs-recover2.sh b/t/test-trs-recover2.sh
index eeb099bd8..acd5a9c5c 100644
--- a/t/test-trs-recover2.sh
+++ b/t/test-trs-recover2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tests-environment-and-log-compiler.sh b/t/tests-environment-and-log-compiler.sh
index 68085fdcd..ad328eb0a 100644
--- a/t/tests-environment-and-log-compiler.sh
+++ b/t/tests-environment-and-log-compiler.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tests-environment-backcompat.sh b/t/tests-environment-backcompat.sh
index ed3661f5a..a8494d4c0 100644
--- a/t/tests-environment-backcompat.sh
+++ b/t/tests-environment-backcompat.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tests-environment-fd-redirect.sh b/t/tests-environment-fd-redirect.sh
index c97605b8d..b8f651191 100644
--- a/t/tests-environment-fd-redirect.sh
+++ b/t/tests-environment-fd-redirect.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/tests-environment.sh b/t/tests-environment.sh
index 96d6434bb..7ae17e968 100644
--- a/t/tests-environment.sh
+++ b/t/tests-environment.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/testsuite-summary-color.sh b/t/testsuite-summary-color.sh
index b79b96e1f..04106cee3 100644
--- a/t/testsuite-summary-color.sh
+++ b/t/testsuite-summary-color.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/testsuite-summary-count-many.sh b/t/testsuite-summary-count-many.sh
index 1458f25d3..9026a120f 100644
--- a/t/testsuite-summary-count-many.sh
+++ b/t/testsuite-summary-count-many.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/testsuite-summary-count.sh b/t/testsuite-summary-count.sh
index 12484ee40..183624455 100644
--- a/t/testsuite-summary-count.sh
+++ b/t/testsuite-summary-count.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/testsuite-summary-reference-log.sh b/t/testsuite-summary-reference-log.sh
index 8d375d0a1..d9e9a8d9c 100644
--- a/t/testsuite-summary-reference-log.sh
+++ b/t/testsuite-summary-reference-log.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/transform.sh b/t/transform.sh
index 36e00e83c..c67011ba9 100644
--- a/t/transform.sh
+++ b/t/transform.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/transform2.sh b/t/transform2.sh
index 122ef7708..d2587367e 100644
--- a/t/transform2.sh
+++ b/t/transform2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/transform3.sh b/t/transform3.sh
index 604c7b6b9..d03d64400 100644
--- a/t/transform3.sh
+++ b/t/transform3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/txinfo-absolute-srcdir-pr408.sh b/t/txinfo-absolute-srcdir-pr408.sh
index 794bbb269..5a995233f 100644
--- a/t/txinfo-absolute-srcdir-pr408.sh
+++ b/t/txinfo-absolute-srcdir-pr408.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/txinfo-add-missing-and-dist.sh b/t/txinfo-add-missing-and-dist.sh
index 2a4fa84f2..c1a72022d 100644
--- a/t/txinfo-add-missing-and-dist.sh
+++ b/t/txinfo-add-missing-and-dist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999-2015 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 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
diff --git a/t/txinfo-bsd-make-recurs.sh b/t/txinfo-bsd-make-recurs.sh
index a3f4bebd6..6d8e07955 100644
--- a/t/txinfo-bsd-make-recurs.sh
+++ b/t/txinfo-bsd-make-recurs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 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
diff --git a/t/txinfo-builddir.sh b/t/txinfo-builddir.sh
index f5a134b1e..5e4baaff2 100644
--- a/t/txinfo-builddir.sh
+++ b/t/txinfo-builddir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/txinfo-clean.sh b/t/txinfo-clean.sh
index 7a03d9311..a492368d8 100644
--- a/t/txinfo-clean.sh
+++ b/t/txinfo-clean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/txinfo-dvi-recurs.sh b/t/txinfo-dvi-recurs.sh
index 2f20b3c78..af017316c 100644
--- a/t/txinfo-dvi-recurs.sh
+++ b/t/txinfo-dvi-recurs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/txinfo-include.sh b/t/txinfo-include.sh
index 9387fcb47..0efda433c 100644
--- a/t/txinfo-include.sh
+++ b/t/txinfo-include.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/txinfo-info-in-srcdir.sh b/t/txinfo-info-in-srcdir.sh
index 77aaf02f5..4798fb259 100644
--- a/t/txinfo-info-in-srcdir.sh
+++ b/t/txinfo-info-in-srcdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/txinfo-makeinfo-error-no-clobber.sh b/t/txinfo-makeinfo-error-no-clobber.sh
index d318c5c92..a8566a4e9 100644
--- a/t/txinfo-makeinfo-error-no-clobber.sh
+++ b/t/txinfo-makeinfo-error-no-clobber.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/txinfo-many-output-formats-vpath.sh b/t/txinfo-many-output-formats-vpath.sh
index 2d22f3c63..b82cd6e7f 100644
--- a/t/txinfo-many-output-formats-vpath.sh
+++ b/t/txinfo-many-output-formats-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/txinfo-many-output-formats.sh b/t/txinfo-many-output-formats.sh
index 813c4dcc6..36e6e08b4 100644
--- a/t/txinfo-many-output-formats.sh
+++ b/t/txinfo-many-output-formats.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/txinfo-no-clutter.sh b/t/txinfo-no-clutter.sh
index cad10c917..0152390ee 100644
--- a/t/txinfo-no-clutter.sh
+++ b/t/txinfo-no-clutter.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/txinfo-no-extra-dist.sh b/t/txinfo-no-extra-dist.sh
index 886443f0f..8dc9c856e 100644
--- a/t/txinfo-no-extra-dist.sh
+++ b/t/txinfo-no-extra-dist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/txinfo-no-installinfo.sh b/t/txinfo-no-installinfo.sh
index bb15d3f9b..d1d79dd86 100644
--- a/t/txinfo-no-installinfo.sh
+++ b/t/txinfo-no-installinfo.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/txinfo-no-repeated-targets.sh b/t/txinfo-no-repeated-targets.sh
index e6856a428..45006cf5f 100644
--- a/t/txinfo-no-repeated-targets.sh
+++ b/t/txinfo-no-repeated-targets.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/txinfo-no-split.sh b/t/txinfo-no-split.sh
index a7debb54a..05d5a2413 100644
--- a/t/txinfo-no-split.sh
+++ b/t/txinfo-no-split.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/txinfo-nodist-info.sh b/t/txinfo-nodist-info.sh
index 703976e7f..da3bc2627 100644
--- a/t/txinfo-nodist-info.sh
+++ b/t/txinfo-nodist-info.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2013-2015 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 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
diff --git a/t/txinfo-other-suffixes.sh b/t/txinfo-other-suffixes.sh
index faed07973..b2d9eb3e1 100644
--- a/t/txinfo-other-suffixes.sh
+++ b/t/txinfo-other-suffixes.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/txinfo-override-infodeps.sh b/t/txinfo-override-infodeps.sh
index 283c16ff9..a3abb01e2 100644
--- a/t/txinfo-override-infodeps.sh
+++ b/t/txinfo-override-infodeps.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/txinfo-override-texinfo-tex.sh b/t/txinfo-override-texinfo-tex.sh
index 2ed68f1c8..b6243eb20 100644
--- a/t/txinfo-override-texinfo-tex.sh
+++ b/t/txinfo-override-texinfo-tex.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 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
diff --git a/t/txinfo-setfilename-repeated.sh b/t/txinfo-setfilename-repeated.sh
index 216304abd..5f991c208 100644
--- a/t/txinfo-setfilename-repeated.sh
+++ b/t/txinfo-setfilename-repeated.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/txinfo-setfilename-suffix-strip.sh b/t/txinfo-setfilename-suffix-strip.sh
index 2c637a558..e84c2214a 100644
--- a/t/txinfo-setfilename-suffix-strip.sh
+++ b/t/txinfo-setfilename-suffix-strip.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/txinfo-subdir-pr343.sh b/t/txinfo-subdir-pr343.sh
index f8f11aacd..094c044a5 100644
--- a/t/txinfo-subdir-pr343.sh
+++ b/t/txinfo-subdir-pr343.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/txinfo-tex-dist.sh b/t/txinfo-tex-dist.sh
index 1f098e89a..ba29153b9 100644
--- a/t/txinfo-tex-dist.sh
+++ b/t/txinfo-tex-dist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/txinfo-unrecognized-extension.sh b/t/txinfo-unrecognized-extension.sh
index 23a018f3c..602db1a3b 100644
--- a/t/txinfo-unrecognized-extension.sh
+++ b/t/txinfo-unrecognized-extension.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/txinfo-unrecognized-info-suffix.sh b/t/txinfo-unrecognized-info-suffix.sh
index ec3aa61fa..d9895e77f 100644
--- a/t/txinfo-unrecognized-info-suffix.sh
+++ b/t/txinfo-unrecognized-info-suffix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/txinfo-vtexi.sh b/t/txinfo-vtexi.sh
index 83c6322be..a4953dcd5 100644
--- a/t/txinfo-vtexi.sh
+++ b/t/txinfo-vtexi.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/txinfo-vtexi2.sh b/t/txinfo-vtexi2.sh
index e9691ef32..520bd7276 100644
--- a/t/txinfo-vtexi2.sh
+++ b/t/txinfo-vtexi2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/txinfo-vtexi3.sh b/t/txinfo-vtexi3.sh
index b5b1c8601..10598f820 100644
--- a/t/txinfo-vtexi3.sh
+++ b/t/txinfo-vtexi3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/txinfo-vtexi4.sh b/t/txinfo-vtexi4.sh
index 3d3ad0594..9ab8f36bf 100644
--- a/t/txinfo-vtexi4.sh
+++ b/t/txinfo-vtexi4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/txinfo-without-info-suffix.sh b/t/txinfo-without-info-suffix.sh
index a9b90b813..708c53597 100644
--- a/t/txinfo-without-info-suffix.sh
+++ b/t/txinfo-without-info-suffix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/uninstall-fail.sh b/t/uninstall-fail.sh
index 41bd57be7..33c74c413 100644
--- a/t/uninstall-fail.sh
+++ b/t/uninstall-fail.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/uninstall-pr9578.sh b/t/uninstall-pr9578.sh
index aa2cb5889..3f0c788e8 100644
--- a/t/uninstall-pr9578.sh
+++ b/t/uninstall-pr9578.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/unused.sh b/t/unused.sh
index 54d1ebef6..be3fb9a7d 100644
--- a/t/unused.sh
+++ b/t/unused.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/upc.sh b/t/upc.sh
index 7ce02b8d0..5d935564c 100644
--- a/t/upc.sh
+++ b/t/upc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/upc2.sh b/t/upc2.sh
index cf01d4435..c6f303bec 100644
--- a/t/upc2.sh
+++ b/t/upc2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/upc3.sh b/t/upc3.sh
index e7ec191bf..ff25ca0a2 100644
--- a/t/upc3.sh
+++ b/t/upc3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 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
diff --git a/t/vala-configure.sh b/t/vala-configure.sh
index 823ae742b..aa264b102 100644
--- a/t/vala-configure.sh
+++ b/t/vala-configure.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2008-2015 Free Software Foundation, Inc.
+# Copyright (C) 2008-2017 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
diff --git a/t/vala-grepping.sh b/t/vala-grepping.sh
index dc84b3c11..3b205e827 100644
--- a/t/vala-grepping.sh
+++ b/t/vala-grepping.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/vala-headers.sh b/t/vala-headers.sh
index de905bc5a..1b41f50db 100644
--- a/t/vala-headers.sh
+++ b/t/vala-headers.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/vala-libs.sh b/t/vala-libs.sh
index badd538ae..5231597a9 100644
--- a/t/vala-libs.sh
+++ b/t/vala-libs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/vala-mix.sh b/t/vala-mix.sh
index 778610868..4c6f70f93 100644
--- a/t/vala-mix.sh
+++ b/t/vala-mix.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
index 11ae48d11..ac5aae225 100644
--- a/t/vala-mix2.sh
+++ b/t/vala-mix2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/vala-non-recursive-setup.sh b/t/vala-non-recursive-setup.sh
index 5faafab6a..2f783b25b 100644
--- a/t/vala-non-recursive-setup.sh
+++ b/t/vala-non-recursive-setup.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/vala-parallel.sh b/t/vala-parallel.sh
index 079bd95c5..d850704b2 100644
--- a/t/vala-parallel.sh
+++ b/t/vala-parallel.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/vala-per-target-flags.sh b/t/vala-per-target-flags.sh
index 7c6828aad..bf5b431b1 100644
--- a/t/vala-per-target-flags.sh
+++ b/t/vala-per-target-flags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/vala-recursive-setup.sh b/t/vala-recursive-setup.sh
index ce3d92617..13faec9d2 100644
--- a/t/vala-recursive-setup.sh
+++ b/t/vala-recursive-setup.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh
index cb530dac7..7f5ae01e9 100644
--- a/t/vala-vapi.sh
+++ b/t/vala-vapi.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/vala-vpath.sh b/t/vala-vpath.sh
index fdb802ffa..523f82841 100644
--- a/t/vala-vpath.sh
+++ b/t/vala-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/var-recurs.sh b/t/var-recurs.sh
index 8667e9f01..acbaa905a 100644
--- a/t/var-recurs.sh
+++ b/t/var-recurs.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/var-recurs2.sh b/t/var-recurs2.sh
index 5037da73e..e9d351f7d 100644
--- a/t/var-recurs2.sh
+++ b/t/var-recurs2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/vars.sh b/t/vars.sh
index 234c68efa..53442eb47 100644
--- a/t/vars.sh
+++ b/t/vars.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/vars3.sh b/t/vars3.sh
index 6913b332b..d22261b17 100644
--- a/t/vars3.sh
+++ b/t/vars3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/vartar.sh b/t/vartar.sh
index 5113826be..ab822f23d 100644
--- a/t/vartar.sh
+++ b/t/vartar.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/vartypo2.sh b/t/vartypo2.sh
index 83a7ccb48..7267d32a5 100644
--- a/t/vartypo2.sh
+++ b/t/vartypo2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/vartypos.sh b/t/vartypos.sh
index d4a61e953..fd5a41a6a 100644
--- a/t/vartypos.sh
+++ b/t/vartypos.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/version3.sh b/t/version3.sh
index 9e1d6534a..94a041672 100644
--- a/t/version3.sh
+++ b/t/version3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/version4.sh b/t/version4.sh
index 2412c46de..563b7fb65 100644
--- a/t/version4.sh
+++ b/t/version4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/version6.sh b/t/version6.sh
index aa1b7eb6f..68191b617 100644
--- a/t/version6.sh
+++ b/t/version6.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/version7.sh b/t/version7.sh
index 7f5e03bed..dd89588d7 100644
--- a/t/version7.sh
+++ b/t/version7.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/version8.sh b/t/version8.sh
index 234121f04..9f1247130 100644
--- a/t/version8.sh
+++ b/t/version8.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2005-2015 Free Software Foundation, Inc.
+# Copyright (C) 2005-2017 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
diff --git a/t/vpath.sh b/t/vpath.sh
index ce79c67b5..5d2132797 100644
--- a/t/vpath.sh
+++ b/t/vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/warning-groups-win-over-strictness.sh b/t/warning-groups-win-over-strictness.sh
index c483f638b..94a89a789 100644
--- a/t/warning-groups-win-over-strictness.sh
+++ b/t/warning-groups-win-over-strictness.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/warnings-obsolete-default.sh b/t/warnings-obsolete-default.sh
index 8ce479ee8..3d273edd0 100644
--- a/t/warnings-obsolete-default.sh
+++ b/t/warnings-obsolete-default.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/warnings-override.sh b/t/warnings-override.sh
index 8c25b959c..0f257ca75 100644
--- a/t/warnings-override.sh
+++ b/t/warnings-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/warnings-precedence.sh b/t/warnings-precedence.sh
index 0e6bb3fb5..3fd2e9b75 100644
--- a/t/warnings-precedence.sh
+++ b/t/warnings-precedence.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/warnings-strictness-interactions.sh b/t/warnings-strictness-interactions.sh
index 18a660cb6..914c00f97 100644
--- a/t/warnings-strictness-interactions.sh
+++ b/t/warnings-strictness-interactions.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/warnings-unknown.sh b/t/warnings-unknown.sh
index 17513745d..f696f0b77 100644
--- a/t/warnings-unknown.sh
+++ b/t/warnings-unknown.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/warnings-win-over-strictness.sh b/t/warnings-win-over-strictness.sh
index 388517add..b30c6b88f 100644
--- a/t/warnings-win-over-strictness.sh
+++ b/t/warnings-win-over-strictness.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/warnopts.sh b/t/warnopts.sh
index 383a2ad48..136673a5c 100644
--- a/t/warnopts.sh
+++ b/t/warnopts.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/werror.sh b/t/werror.sh
index 9da201084..84fece94e 100644
--- a/t/werror.sh
+++ b/t/werror.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/werror2.sh b/t/werror2.sh
index 12b134155..96b2025cc 100644
--- a/t/werror2.sh
+++ b/t/werror2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 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
diff --git a/t/werror3.sh b/t/werror3.sh
index 53aea01d3..d130911c2 100644
--- a/t/werror3.sh
+++ b/t/werror3.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/werror4.sh b/t/werror4.sh
index 2029ba09e..3787a82eb 100644
--- a/t/werror4.sh
+++ b/t/werror4.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/whoami.sh b/t/whoami.sh
index 36ff8a774..4b45269f1 100644
--- a/t/whoami.sh
+++ b/t/whoami.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 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
diff --git a/t/wrap/aclocal.in b/t/wrap/aclocal.in
index a891c78af..a624bcb16 100644
--- a/t/wrap/aclocal.in
+++ b/t/wrap/aclocal.in
@@ -1,7 +1,7 @@
#!@PERL@ -w
# @configure_input@
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/wrap/automake.in b/t/wrap/automake.in
index d434422a4..1075346a1 100644
--- a/t/wrap/automake.in
+++ b/t/wrap/automake.in
@@ -1,7 +1,7 @@
#!@PERL@ -w
# @configure_input@
-# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 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
diff --git a/t/xsource.sh b/t/xsource.sh
index d8b905887..7c37a42e0 100644
--- a/t/xsource.sh
+++ b/t/xsource.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/yacc-auxdir.sh b/t/yacc-auxdir.sh
index 152b0b835..3bb3a3a30 100644
--- a/t/yacc-auxdir.sh
+++ b/t/yacc-auxdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh
index 610d911ab..d419fc537 100644
--- a/t/yacc-basic.sh
+++ b/t/yacc-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/yacc-bison-skeleton-cxx.sh b/t/yacc-bison-skeleton-cxx.sh
index 6e22cbed4..95c0daec1 100644
--- a/t/yacc-bison-skeleton-cxx.sh
+++ b/t/yacc-bison-skeleton-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yacc-bison-skeleton.sh b/t/yacc-bison-skeleton.sh
index 03440c541..6d577f75f 100644
--- a/t/yacc-bison-skeleton.sh
+++ b/t/yacc-bison-skeleton.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yacc-clean-cxx.sh b/t/yacc-clean-cxx.sh
index 6e484bbfa..28b717289 100644
--- a/t/yacc-clean-cxx.sh
+++ b/t/yacc-clean-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yacc-clean.sh b/t/yacc-clean.sh
index 8387544f9..a83ba7d05 100644
--- a/t/yacc-clean.sh
+++ b/t/yacc-clean.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yacc-cxx-grepping.sh b/t/yacc-cxx-grepping.sh
index 3990bf808..3b330c492 100644
--- a/t/yacc-cxx-grepping.sh
+++ b/t/yacc-cxx-grepping.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 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
diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh
index f3296758d..b69f523f9 100644
--- a/t/yacc-cxx.sh
+++ b/t/yacc-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yacc-d-basic.sh b/t/yacc-d-basic.sh
index 7232d7f25..c9ac930af 100644
--- a/t/yacc-d-basic.sh
+++ b/t/yacc-d-basic.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yacc-d-cxx.sh b/t/yacc-d-cxx.sh
index 16c4ac3df..98a8725e5 100644
--- a/t/yacc-d-cxx.sh
+++ b/t/yacc-d-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yacc-d-vpath.sh b/t/yacc-d-vpath.sh
index 7950c24f1..c55e0b180 100644
--- a/t/yacc-d-vpath.sh
+++ b/t/yacc-d-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yacc-deleted-headers.sh b/t/yacc-deleted-headers.sh
index d46b39da3..e718fa146 100644
--- a/t/yacc-deleted-headers.sh
+++ b/t/yacc-deleted-headers.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yacc-depend.sh b/t/yacc-depend.sh
index f15cfa020..b9c52ddca 100644
--- a/t/yacc-depend.sh
+++ b/t/yacc-depend.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/yacc-depend2.sh b/t/yacc-depend2.sh
index 15781af90..2002919bd 100644
--- a/t/yacc-depend2.sh
+++ b/t/yacc-depend2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh
index 98da7ba72..34fed1be4 100644
--- a/t/yacc-dist-nobuild-subdir.sh
+++ b/t/yacc-dist-nobuild-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yacc-dist-nobuild.sh b/t/yacc-dist-nobuild.sh
index b38bde37d..2bccd0143 100644
--- a/t/yacc-dist-nobuild.sh
+++ b/t/yacc-dist-nobuild.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yacc-dry.sh b/t/yacc-dry.sh
index 58a9edf45..9c34bff3b 100644
--- a/t/yacc-dry.sh
+++ b/t/yacc-dry.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/yacc-grepping.sh b/t/yacc-grepping.sh
index dbbf00724..c7597e589 100644
--- a/t/yacc-grepping.sh
+++ b/t/yacc-grepping.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 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
diff --git a/t/yacc-grepping2.sh b/t/yacc-grepping2.sh
index 1ed80904d..b56fa2af4 100644
--- a/t/yacc-grepping2.sh
+++ b/t/yacc-grepping2.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/yacc-headers-and-dist-pr47.sh b/t/yacc-headers-and-dist-pr47.sh
index 8f3fa145b..5e9d2f444 100644
--- a/t/yacc-headers-and-dist-pr47.sh
+++ b/t/yacc-headers-and-dist-pr47.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/yacc-line.sh b/t/yacc-line.sh
index 39f9522e7..027d41405 100644
--- a/t/yacc-line.sh
+++ b/t/yacc-line.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/yacc-misc.sh b/t/yacc-misc.sh
index fbc827bda..d54060b7b 100644
--- a/t/yacc-misc.sh
+++ b/t/yacc-misc.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/yacc-mix-c-cxx.sh b/t/yacc-mix-c-cxx.sh
index 9d03ef7f9..61ed66496 100644
--- a/t/yacc-mix-c-cxx.sh
+++ b/t/yacc-mix-c-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh
index 866d45aba..bbfb9d9ba 100644
--- a/t/yacc-nodist.sh
+++ b/t/yacc-nodist.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yacc-pr204.sh b/t/yacc-pr204.sh
index 6d8470468..fb067f059 100644
--- a/t/yacc-pr204.sh
+++ b/t/yacc-pr204.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/yacc-subdir.sh b/t/yacc-subdir.sh
index 67bb5f596..be5f4a7a7 100644
--- a/t/yacc-subdir.sh
+++ b/t/yacc-subdir.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 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
diff --git a/t/yacc-vpath.sh b/t/yacc-vpath.sh
index c05d0df8b..c8810ba15 100644
--- a/t/yacc-vpath.sh
+++ b/t/yacc-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 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
diff --git a/t/yacc-weirdnames.sh b/t/yacc-weirdnames.sh
index a2a1dcac6..f36d8c8ed 100644
--- a/t/yacc-weirdnames.sh
+++ b/t/yacc-weirdnames.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yflags-cmdline-override.sh b/t/yflags-cmdline-override.sh
index c733d4676..401856744 100644
--- a/t/yflags-cmdline-override.sh
+++ b/t/yflags-cmdline-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yflags-conditional.sh b/t/yflags-conditional.sh
index 41ceae563..e3a2b5400 100644
--- a/t/yflags-conditional.sh
+++ b/t/yflags-conditional.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yflags-cxx.sh b/t/yflags-cxx.sh
index 32463942a..d5922d091 100644
--- a/t/yflags-cxx.sh
+++ b/t/yflags-cxx.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
diff --git a/t/yflags-d-false-positives.sh b/t/yflags-d-false-positives.sh
index e463af700..f7c745b84 100644
--- a/t/yflags-d-false-positives.sh
+++ b/t/yflags-d-false-positives.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yflags-force-conditional.sh b/t/yflags-force-conditional.sh
index 96573a8d9..8cb16db25 100644
--- a/t/yflags-force-conditional.sh
+++ b/t/yflags-force-conditional.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yflags-force-override.sh b/t/yflags-force-override.sh
index b68ba0bae..d6348adac 100644
--- a/t/yflags-force-override.sh
+++ b/t/yflags-force-override.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yflags-var-expand.sh b/t/yflags-var-expand.sh
index 5d816b001..dc7f53d58 100644
--- a/t/yflags-var-expand.sh
+++ b/t/yflags-var-expand.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 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
diff --git a/t/yflags.sh b/t/yflags.sh
index 6eeaa7dfd..13c714609 100644
--- a/t/yflags.sh
+++ b/t/yflags.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 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
--
cgit v1.2.1
From f4e91bfc490da63209aad19636568da3b955dcd4 Mon Sep 17 00:00:00 2001
From: Thomas Martitz
Date: Mon, 13 Mar 2017 12:41:59 +0100
Subject: automake: Shorter object file names under subdir-objects
Combining the 'subdir-objects' option with target-specific flags had
the consequence of producing long object file names. This was done to
preventively ensure the uniqueness of object file names. We are now
using shorter names by default, and handle long names when an actual
conflict is detected. This will hopefully reduce the necessity of
using the 'prog_SHORTNAME' facility.
Example:
previously:
AUTOMAKE_OPTIONS = subdir-objects
bin_PROGRAMS += path/to/foo
path_to_foo_CFLAGS = $(AM_CFLAGS) -g
resulted in objects:
sub/path_to_foo-foo.o
now object file name is:
sub/foo-foo.o
* bin/automake.in (proglist, liblist, ltliblist)
(dup_shortnames): New globals.
(initialize_per_input): Initialize them.
(handle_targets): New subroutine.
(handle_single_transform): Truncate object file names when possible.
* t/subobj-objname-clash.sh: New test.
* t/list-of-tests.mk (handwritten_TESTS): Add it.
* NEWS: Update.
Signed-off-by: Mathieu Lirzin
---
NEWS | 7 ++++
bin/automake.in | 102 +++++++++++++++++++++++++++++++++++++--------
t/list-of-tests.mk | 1 +
t/subobj-objname-clash.sh | 104 ++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 197 insertions(+), 17 deletions(-)
create mode 100644 t/subobj-objname-clash.sh
diff --git a/NEWS b/NEWS
index 5aa2c8824..5ddf6a06e 100644
--- a/NEWS
+++ b/NEWS
@@ -64,6 +64,13 @@
New in 1.16:
+* Miscellaneous changes
+
+ - When subdir-objects is in effect, Automake will now construct
+ shorter object file names when no programs and libraries name
+ clashes are encountered. This should make the discouraged use of
+ 'foo_SHORTNAME' unnecessary in many cases.
+
* Bugs fixed:
- Automatic dependency tracking has been fixed to work also when the
diff --git a/bin/automake.in b/bin/automake.in
index 8db874cc7..d126836a0 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -74,6 +74,7 @@ use Automake::Wrap 'makefile_wrap';
use Automake::Language;
use File::Basename;
use File::Spec;
+use List::Util 'none';
use Carp;
## ----------------------- ##
@@ -472,6 +473,15 @@ my %dep_files;
# This is a list of all targets to run during "make dist".
my @dist_targets;
+# List of all programs, libraries and ltlibraries as returned
+# by am_install_var
+my @proglist;
+my @liblist;
+my @ltliblist;
+# Blacklist of targets (as canonical base name) for which object file names
+# may not be automatically shortened
+my @dup_shortnames;
+
# Keep track of all programs declared in this Makefile, without
# $(EXEEXT). @substitutions@ are not listed.
my %known_programs;
@@ -592,6 +602,11 @@ sub initialize_per_input ()
@dist_common = ();
$handle_dist_run = 0;
+ @proglist = ();
+ @liblist = ();
+ @ltliblist = ();
+ @dup_shortnames = ();
+
%known_programs = ();
%known_libraries = ();
@@ -1704,14 +1719,48 @@ sub handle_single_transform
# object. In this case we rewrite the object's
# name to ensure it is unique.
- # We choose the name 'DERIVED_OBJECT' to ensure
- # (1) uniqueness, and (2) continuity between
- # invocations. However, this will result in a
- # name that is too long for losing systems, in
- # some situations. So we provide _SHORTNAME to
- # override.
-
- my $dname = $derived;
+ # We choose the name 'DERIVED_OBJECT' to ensure (1) uniqueness,
+ # and (2) continuity between invocations. However, this will
+ # result in a name that is too long for losing systems, in some
+ # situations. So we attempt to shorten automatically under
+ # subdir-objects, and provide _SHORTNAME to override as a last
+ # resort. If subdir-object is in effect, it's usually
+ # unnecessary to use the complete 'DERIVED_OBJECT' (that is
+ # often the result from %canon_reldir%/%C% usage) since objects
+ # are placed next to their source file. Generally, this means
+ # it is already unique within that directory (see below for an
+ # exception). Thus, we try to avoid unnecessarily long file
+ # names by stripping the directory components of
+ # 'DERIVED_OBJECT'. This allows avoiding explicit _SHORTNAME
+ # usage in many cases. EXCEPTION: If two (or more) targets in
+ # different directories but with the same base name (after
+ # canonicalization), using target-specific FLAGS, link the same
+ # object, then this logic clashes. Thus, we don't strip if
+ # this is detected.
+ my $dname = $derived;
+ if ($directory ne ''
+ && option 'subdir-objects'
+ && none { $dname =~ /$_$/ } @dup_shortnames)
+ {
+ # At this point, we don't clear information about what
+ # parts of $derived are truly file name components. We can
+ # determine that by comparing against the canonicalization
+ # of $directory.
+ my $dir = $directory . "/";
+ my $cdir = canonicalize ($dir);
+ my $dir_len = length ($dir);
+ # Make sure we only strip full file name components. This
+ # is done by repeatedly trying to find cdir at the
+ # beginning. Each iteration removes one file name
+ # component from the end of cdir.
+ while ($dir_len > 0 && index ($derived, $cdir) != 0)
+ {
+ # Eventually $dir_len becomes 0.
+ $dir_len = rindex ($dir, "/", $dir_len - 2) + 1;
+ $cdir = substr ($cdir, 0, $dir_len);
+ }
+ $dname = substr ($derived, $dir_len);
+ }
my $var = var ($derived . '_SHORTNAME');
if ($var)
{
@@ -2432,12 +2481,33 @@ sub handle_libtool ()
LTRMS => join ("\n", @libtool_rms));
}
+# Check for duplicate targets
+sub handle_targets ()
+{
+ my %seen = ();
+ my @dups = ();
+ @proglist = am_install_var ('progs', 'PROGRAMS',
+ 'bin', 'sbin', 'libexec', 'pkglibexec',
+ 'noinst', 'check');
+ @liblist = am_install_var ('libs', 'LIBRARIES',
+ 'lib', 'pkglib', 'noinst', 'check');
+ @ltliblist = am_install_var ('ltlib', 'LTLIBRARIES',
+ 'noinst', 'lib', 'pkglib', 'check');
+
+ # Record duplications that may arise after canonicalization of the
+ # base names, in order to prevent object file clashes in the presence
+ # of target-specific *FLAGS
+ my @targetlist = (@proglist, @liblist, @ltliblist);
+ foreach my $pair (@targetlist)
+ {
+ my $base = canonicalize (basename (@$pair[1]));
+ push (@dup_shortnames, $base) if ($seen{$base});
+ $seen{$base} = $base;
+ }
+}
sub handle_programs ()
{
- my @proglist = am_install_var ('progs', 'PROGRAMS',
- 'bin', 'sbin', 'libexec', 'pkglibexec',
- 'noinst', 'check');
return if ! @proglist;
$must_handle_compiled_objects = 1;
@@ -2524,8 +2594,6 @@ sub handle_programs ()
sub handle_libraries ()
{
- my @liblist = am_install_var ('libs', 'LIBRARIES',
- 'lib', 'pkglib', 'noinst', 'check');
return if ! @liblist;
$must_handle_compiled_objects = 1;
@@ -2634,9 +2702,7 @@ sub handle_libraries ()
sub handle_ltlibraries ()
{
- my @liblist = am_install_var ('ltlib', 'LTLIBRARIES',
- 'noinst', 'lib', 'pkglib', 'check');
- return if ! @liblist;
+ return if ! @ltliblist;
$must_handle_compiled_objects = 1;
my @prefix = am_primary_prefixes ('LTLIBRARIES', 0, 'lib', 'pkglib',
@@ -2729,7 +2795,7 @@ sub handle_ltlibraries ()
skip_ac_subst => 1);
}
- foreach my $pair (@liblist)
+ foreach my $pair (@ltliblist)
{
my ($where, $onelib) = @$pair;
@@ -7793,6 +7859,8 @@ sub generate_makefile
handle_configure ($makefile_am, $makefile_in, $makefile, @inputs);
handle_gettext;
+
+ handle_targets;
handle_libraries;
handle_ltlibraries;
handle_programs;
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 15755c52b..dacdc8dd8 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -1062,6 +1062,7 @@ t/subobjname.sh \
t/subobj-clean-pr10697.sh \
t/subobj-clean-lt-pr10697.sh \
t/subobj-indir-pr13928.sh \
+t/subobj-objname-clash.sh \
t/subobj-vpath-pr13928.sh \
t/subobj-pr13928-more-langs.sh \
t/subpkg.sh \
diff --git a/t/subobj-objname-clash.sh b/t/subobj-objname-clash.sh
new file mode 100644
index 000000000..a33d36bc5
--- /dev/null
+++ b/t/subobj-objname-clash.sh
@@ -0,0 +1,104 @@
+#! /bin/sh
+# Copyright (C) 1996-2017 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+# Make sure that object names don't clash when using subdir-objects.
+# The check is done for clashing programs, clashing libraries and
+# a program that clashes with a library
+
+. test-init.sh
+
+mkdir src
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects foreign
+noinst_PROGRAMS =
+noinst_LIBRARIES =
+
+# CLASHING PROGRAMS
+noinst_PROGRAMS += foo src/foo
+foo_SOURCES = src/foo.c src/main.c
+foo_CPPFLAGS = -DVAL=0
+src_foo_CPPFLAGS = -DVAL=1
+src_foo_SOURCES = src/foo.c src/main.c
+
+# CLASHING LIBS
+noinst_PROGRAMS += bar src/bar
+noinst_LIBRARIES += libbar.a src/libbar.a
+bar_SOURCES = src/main.c
+bar_LDADD = libbar.a
+src_bar_SOURCES = src/main.c
+src_bar_LDADD = src/libbar.a
+libbar_a_SOURCES = src/foo.c
+libbar_a_CPPFLAGS = -DVAL=0
+src_libbar_a_SOURCES = src/foo.c
+src_libbar_a_CPPFLAGS = -DVAL=1
+
+# CLASHING PROGRAM + LIB
+noinst_PROGRAMS += libzap_a src/zap
+noinst_LIBRARIES += src/libzap.a
+libzap_a_SOURCES = src/main.c src/foo.c
+libzap_a_CPPFLAGS = -DVAL=2
+src_zap_SOURCES = src/main.c
+src_zap_LDADD = src/libzap.a
+src_libzap_a_SOURCES = src/foo.c
+src_libzap_a_CPPFLAGS = -DVAL=3
+
+# NON-CLASHING
+noinst_PROGRAMS += src/foo-uniq
+src_foo_uniq_SOURCES = src/main.c src/foo.c
+src_foo_uniq_CPPFLAGS = -DVAL=4
+END
+
+cat > src/foo.c << 'END'
+int
+foo ()
+{
+ return VAL;
+}
+END
+
+cat > src/main.c << 'END'
+int foo (void);
+
+int
+main ()
+{
+ return foo ();
+}
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+
+./configure
+$MAKE
+set +e
+./foo || fail_ "./foo should return 0"
+./src/foo; test $? = 1 || fail_ "./src/foo should return 1"
+./bar || fail_ "./bar should return 0"
+./src/bar; test $? = 1 || fail_ "./src/bar should return 1"
+./libzap_a; test $? = 2 || fail_ "./libfoo_a should return 2"
+./src/zap; test $? = 3 || fail_ "./src/prog_libfoo should return 3"
+./src/foo-uniq; test $? = 4 || fail_ "./foo_uniq should return 4"
+set -e
+$MAKE clean
--
cgit v1.2.1
From 87becfb21a35d79f32cb1af083124c8e116b1c2a Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Sat, 15 Jul 2017 15:46:52 +0200
Subject: python: Add python3.6
This fixes bug#27458.
* m4/python.m4 (AM_PATH_PYTHON): Add python3.6.
---
m4/python.m4 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/m4/python.m4 b/m4/python.m4
index 6d9e93401..bd66aae46 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -38,8 +38,9 @@ AC_DEFUN([AM_PATH_PYTHON],
dnl supported. (2.0 was released on October 16, 2000).
dnl FIXME: Remove the need to hard-code Python versions here.
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
- python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
+[python python2 python3 python3.6 python3.5 python3.4 python3.3 python3.2 dnl
+ python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 dnl
+ python2.2 python2.1 python2.0])
AC_ARG_VAR([PYTHON], [the Python interpreter])
--
cgit v1.2.1
From fd244f28f5637e13009f75b6962d03401b22149c Mon Sep 17 00:00:00 2001
From: Thomas Jahns
Date: Mon, 29 Jun 2015 09:50:02 +0200
Subject: aclocal: Avoid problematic string interpolation
This fixes bug#20903. Thanks to Eric Bavier for reporting this issue.
* bin/aclocal.in (automake_includes): Avoid problematic string
interpolation.
* NEWS: Update.
* THANKS: Thank Eric Bavier.
Signed-off-by: Mathieu Lirzin
---
NEWS | 3 +++
THANKS | 1 +
bin/aclocal.in | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 5ddf6a06e..602b1a258 100644
--- a/NEWS
+++ b/NEWS
@@ -110,6 +110,9 @@ New in 1.16:
This was the second part of automake bug#13928.
+ - Installed 'aclocal' m4 macros can now accept installation directories
+ containing '@' characters (automake bug#20903)
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.15.1:
diff --git a/THANKS b/THANKS
index 04ddb1357..fccce277b 100644
--- a/THANKS
+++ b/THANKS
@@ -111,6 +111,7 @@ Elmar Hoffmann elho@elho.net
Elrond Elrond@Wunder-Nett.org
Enrico Scholz enrico.scholz@informatik.tu-chemnitz.de
Erez Zadok ezk@cs.columbia.edu
+Eric Bavier bavier@cray.com
Eric Blake eblake@redhat.com
Eric Dorland eric@debian.org
Eric Magnien emagnien@club-internet.fr
diff --git a/bin/aclocal.in b/bin/aclocal.in
index a4535bc47..7350c8e38 100644
--- a/bin/aclocal.in
+++ b/bin/aclocal.in
@@ -69,7 +69,7 @@ $perl_threads = 0;
# ACLOCAL_PATH environment variable, and reset with the '--system-acdir'
# option.
my @user_includes = ();
-my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
+my @automake_includes = ('@datadir@/aclocal-' . $APIVERSION);
my @system_includes = ('@datadir@/aclocal');
# Whether we should copy M4 file in $user_includes[0].
--
cgit v1.2.1
From 3126fa4c6b69c043e20af9381563069c0f2a0ba0 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Sat, 15 Jul 2017 22:24:43 +0200
Subject: dejagnu: Allow AM_RUNTESTFLAGS to override default RUNTEST arguments
This fixes bug#25335.
* lib/am/dejagnu.am (check-DEJAGNU): Swap $(RUNTESTDEFAULTFLAGS) and
$(AM_RUNTESTFLAGS).
* THANKS: Update.
---
THANKS | 1 +
lib/am/dejagnu.am | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/THANKS b/THANKS
index fccce277b..373364914 100644
--- a/THANKS
+++ b/THANKS
@@ -60,6 +60,7 @@ Brian Gough bjg@network-theory.co.uk
Brian Jones cbj@nortel.net
Bruce Korb bkorb@gnu.org
Bruno Haible haible@ilog.fr
+Carnë Draug carandraug+dev@gmail.com
Carsten Lohrke carlo@gentoo.org
Charles Wilson cwilson@ece.gatech.edu
Chris Hoogendyk hoogendyk@bio.umass.edu
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index 75ec97dca..04e97e2b1 100644
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -33,7 +33,7 @@ check-DEJAGNU: site.exp
## pointless to cause a failure if the tests cannot be run at all.
if $(SHELL) -c "$(RUNTEST) --version" > /dev/null 2>&1; then \
exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \
- if $(RUNTEST) $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
+ if $(RUNTEST) $(RUNTESTDEFAULTFLAGS) $(AM_RUNTESTFLAGS) $(RUNTESTFLAGS); \
then :; else exit_status=1; fi; \
done; \
else echo "WARNING: could not find '$(RUNTEST)'" 1>&2; :;\
--
cgit v1.2.1
From 8555e7b81d0d68e1e8105d072d69b94788953e15 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Sun, 16 Jul 2017 00:11:07 +0200
Subject: check: Make 'check-TESTS' target depend on test dependencies
The 'check' and 'recheck' targets are already depending on the progams
and scripts required to run the test suite. The 'check-TESTS' target
while not in the public API might be used by uninformed users, so it
makes sense to add the same dependency to it. This fixes bug#27186.
* lib/am/check.am [!%?SERIAL_TESTS%] (check-TESTS): Add dependency to
'%CHECK_DEPS%'.
* THANKS: Update.
---
THANKS | 1 +
lib/am/check.am | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/THANKS b/THANKS
index 373364914..9bc7542af 100644
--- a/THANKS
+++ b/THANKS
@@ -289,6 +289,7 @@ Nathanael Nerode neroden@twcny.rr.com
Nelson H. F. Beebe beebe@math.utah.edu
Nicholas Wourms nwourms@netscape.net
Nick Bowler nbowler@elliptictech.com
+Nick Brown brownn@brocade.com
Nicola Fontana ntd@entidi.it
Nicolas Joly njoly@pasteur.fr
Nicolas Thiery nthiery@Icare.mines.edu
diff --git a/lib/am/check.am b/lib/am/check.am
index 741a5c0f0..ff174191d 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -401,7 +401,7 @@ RECHECK_LOGS = $(TEST_LOGS)
## Running all tests, or rechecking failures. ##
## ------------------------------------------ ##
-check-TESTS:
+check-TESTS: %CHECK_DEPS%
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
## We always have to remove $(TEST_SUITE_LOG), to ensure its rule is run
--
cgit v1.2.1
From 5864fb5564a8607bf9a1fd90e12259127d8c629b Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Sun, 16 Jul 2017 01:02:49 +0200
Subject: doc: Fix typos
This fixes bug#23099.
* doc/automake.texi (Scripts-based Testsuites)
(Parallel Test Harness): Fix typos.
* THANKS: Update.
---
THANKS | 1 +
doc/automake.texi | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/THANKS b/THANKS
index 9bc7542af..02df031f8 100644
--- a/THANKS
+++ b/THANKS
@@ -105,6 +105,7 @@ Dmitry Mikhin dmitrym@acres.com.au
Dmitry V. Levin ldv@altlinux.org
Doug Evans devans@cygnus.com
Duncan Gibson duncan@thermal.esa.int
+Dilyan Palauzov dilyan.palauzov@aegee.org
Ed Hartnett ed@unidata.ucar.edu
Eleftherios Gkioulekas lf@amath.washington.edu
Elena A. Vengerova helen@oktetlabs.ru
diff --git a/doc/automake.texi b/doc/automake.texi
index da0aa2942..f083fc2b4 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8896,7 +8896,7 @@ Note however that, for tests based on more complex test protocols,
the exact effects of @code{XFAIL_TESTS} and @code{DISABLE_HARD_ERRORS}
might change, or they might even have no effect at all (for example,
@c Keep this in sync with tap-no-disable-hard-errors.sh
-in tests using TAP, there is not way to disable hard errors, and the
+in tests using TAP, there is no way to disable hard errors, and the
@code{DISABLE_HARD_ERRORS} variable has no effect on them).
@anchor{Testsuite progress on console}
@@ -9164,7 +9164,7 @@ as a side-effect.
It's important to note that, differently from what we've seen for the
serial test harness (@pxref{Serial Test Harness}), the
@code{AM_TESTS_ENVIRONMENT} and @code{TESTS_ENVIRONMENT} variables
-@emph{cannot} be use to define a custom test runner; the
+@emph{cannot} be used to define a custom test runner; the
@code{LOG_COMPILER} and @code{LOG_FLAGS} (or their extension-specific
counterparts) should be used instead:
--
cgit v1.2.1
From bea673a55bb7ae35933ff2c16ce10b32f476ba4e Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Sun, 16 Jul 2017 02:01:28 +0200
Subject: doc: Fix typo "nothing" => "noting"
This fixes bug#24476.
* doc/automake.texi (Checking the Distribution): Fix typo.
* THANKS: Update.
---
THANKS | 1 +
doc/automake.texi | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/THANKS b/THANKS
index 02df031f8..a2b8c29ec 100644
--- a/THANKS
+++ b/THANKS
@@ -90,6 +90,7 @@ David Byron dbyron@dbyron.com
David Fang fang@csl.cornell.edu
Davyd Madeley davyd@fugro-fsi.com.au
David Pashley david@davidpashley.com
+David Wohlferd dw@limegreensocks.com
David Zaroski cz253@cleveland.Freenet.Edu
Dean Povey dpovey@wedgetail.com
Dennis J. Linse Dennis.J.Linse@SAIC.com
diff --git a/doc/automake.texi b/doc/automake.texi
index f083fc2b4..544f7c1e4 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8576,7 +8576,7 @@ to supply additional flags to @command{configure}, define them in the
provided there by defining the @code{DISTCHECK_CONFIGURE_FLAGS} variable,
on the command line when invoking @command{make}.
@c See automake bug#14991 for more details about how the following holds.
-It's worth nothing that @command{make distcheck} needs complete control
+It's worth noting that @command{make distcheck} needs complete control
over the @command{configure} options @option{--srcdir} and
@option{--prefix}, so those options cannot be overridden by
@code{AM_DISTCHECK_CONFIGURE_FLAGS} nor by
--
cgit v1.2.1
From 9322f409a957f153b38ff37ba79ddf4c19cff6ca Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Tue, 8 Aug 2017 23:55:29 +0200
Subject: doc: Update to latest help2man
This fixes bug#27773.
* doc/help2man: Sync with version 1.47.3 to support reproducible
builds by using $SOURCE_DATE_EPOCH.
---
doc/Makefile.inc | 1 +
doc/help2man | 251 ++++++++++++++++++++++++++++++++++++++-----------------
2 files changed, 176 insertions(+), 76 deletions(-)
diff --git a/doc/Makefile.inc b/doc/Makefile.inc
index b39ce89c7..18c137c5b 100644
--- a/doc/Makefile.inc
+++ b/doc/Makefile.inc
@@ -32,6 +32,7 @@ man1_MANS = \
$(man1_MANS): $(top_srcdir)/configure.ac
CLEANFILES += $(man1_MANS)
+# XXX: This script should be updated with 'fetch' target.
EXTRA_DIST += %D%/help2man
update_mans = \
diff --git a/doc/help2man b/doc/help2man
index e651b8d2d..829a8713b 100755
--- a/doc/help2man
+++ b/doc/help2man
@@ -1,7 +1,8 @@
#!/usr/bin/perl -w
# Generate a short man page from --help and --version output.
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009,
+# 2010, 2011, 2012, 2013, 2014, 2015 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
@@ -19,14 +20,15 @@
# Written by Brendan O'Dea
# Available from ftp://ftp.gnu.org/gnu/help2man/
-use 5.006;
+use 5.008;
use strict;
use Getopt::Long;
+use Text::ParseWords qw(shellwords);
use Text::Tabs qw(expand);
use POSIX qw(strftime setlocale LC_ALL);
my $this_program = 'help2man';
-my $this_version = '1.40.8';
+my $this_version = '1.47.4';
sub _ { $_[0] }
sub configure_locale
@@ -42,11 +44,16 @@ sub enc_user { $_[0] }
sub kark { die +(sprintf shift, @_), "\n" }
sub N_ { $_[0] }
+sub program_basename;
+sub get_option_value;
+sub convert_option;
+sub fix_italic_spacing;
+
my $version_info = enc_user sprintf _(<<'EOT'), $this_program, $this_version;
GNU %s %s
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,
-2011, 2012 Free Software Foundation, Inc.
+2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -117,18 +124,32 @@ Getopt::Long::config('bundling');
die $help_info unless GetOptions %opt_def and @ARGV == 1;
my %include = ();
+my %replace = ();
my %append = ();
-my @include = (); # retain order given in include file
+my %append_match = ();
+my @sections = (); # retain order of include file or in-line *section*s
# Process include file (if given). Format is:
#
-# [section name]
-# verbatim text
+# Optional initial text, ignored. May include lines starting with `-'
+# which are processed as options.
+#
+# [section]
+# Verbatim text to be included in the named section. By default at
+# the start, but in the case of `name' and `synopsis' the content
+# will replace the autogenerated contents.
#
-# or
+# [section]
+# Verbatim text to be appended to the end of the named section.
#
# /pattern/
-# verbatim text
+# Verbatim text for inclusion below a paragraph matching `pattern'.
#
while (@opt_include)
@@ -140,7 +161,7 @@ while (@opt_include)
unless open INC, $inc;
my $key;
- my $hash = \%include;
+ my $hash;
while ()
{
@@ -155,7 +176,23 @@ while (@opt_include)
$key =~ s/^\s+//;
$key =~ s/\s+$//;
$hash = \%include;
- push @include, $key unless $include{$key};
+ # Handle explicit [section]
+ if ($key =~ s/^([<>=])\s*//)
+ {
+ if ($1 eq '>') { $hash = \%append; }
+ elsif ($1 eq '=') { $hash = \%replace; }
+ }
+ # NAME/SYNOPSIS replace by default
+ elsif ($key eq _('NAME') or $key eq _('SYNOPSIS'))
+ {
+ $hash = \%replace;
+ }
+ else
+ {
+ $hash = \%include;
+ }
+
+ push @sections, $key;
next;
}
@@ -172,7 +209,7 @@ while (@opt_include)
die "$inc:$.:$@";
}
- $hash = \%append;
+ $hash = \%append_match;
next;
}
@@ -184,48 +221,57 @@ while (@opt_include)
# handle options
if (/^-/)
{
- local @ARGV = split;
+ local @ARGV = shellwords $_;
GetOptions %opt_def;
}
next;
}
- $hash->{$key} ||= '';
$hash->{$key} .= $_;
}
close INC;
kark N_("%s: no valid information found in `%s'"), $this_program, $inc
- unless $key;
+ unless $key;
}
# Compress trailing blank lines.
-for my $hash (\(%include, %append))
+for my $hash (\(%include, %replace, %append, %append_match))
{
for (keys %$hash) { $hash->{$_} =~ s/\n+$/\n/ }
}
-sub get_option_value;
-
# Grab help and version info from executable.
my $help_text = get_option_value $ARGV[0], $help_option;
$version_text ||= get_option_value $ARGV[0], $version_option;
+# By default the generated manual pages will include the current date. This may
+# however be overriden by setting the environment variable $SOURCE_DATE_EPOCH
+# to an integer value of the seconds since the UNIX epoch. This is primarily
+# intended to support reproducible builds (wiki.debian.org/ReproducibleBuilds)
+# and will additionally ensure that the output date string is UTC.
+my $epoch_secs = time;
+if (exists $ENV{SOURCE_DATE_EPOCH} and $ENV{SOURCE_DATE_EPOCH} =~ /^(\d+)$/)
+{
+ $epoch_secs = $1;
+ $ENV{TZ} = 'UTC';
+}
+
# Translators: the following message is a strftime(3) format string, which in
# the English version expands to the month as a word and the full year. It
# is used on the footer of the generated manual pages. If in doubt, you may
# just use %x as the value (which should be the full locale-specific date).
-my $date = enc strftime _("%B %Y"), localtime;
-(my $program = $ARGV[0]) =~ s!.*/!!;
+my $date = enc strftime _("%B %Y"), localtime $epoch_secs;
+my $program = program_basename $ARGV[0];
my $package = $program;
my $version;
if ($opt_output)
{
unlink $opt_output or kark N_("%s: can't unlink %s (%s)"),
- $this_program, $opt_output, $! if -e $opt_output;
+ $this_program, $opt_output, $! if -e $opt_output;
open STDOUT, ">$opt_output"
or kark N_("%s: can't create %s (%s)"), $this_program, $opt_output, $!;
@@ -247,14 +293,14 @@ if ($opt_output)
if (/^(\S+) +\(((?:GNU|Free) +[^)]+)\) +(.*)/ or
/^(\S+) +- *((?:GNU|Free) +\S+) +(.*)/)
{
- $program = $1;
+ $program = program_basename $1;
$package = $2;
$version = $3;
}
elsif (/^((?:GNU|Free) +)?(\S+) +(.*)/)
{
- $program = $2;
- $package = $1 ? "$1$2" : $2;
+ $program = program_basename $2;
+ $package = $1 ? "$1$program" : $program;
$version = $3;
}
else
@@ -262,21 +308,21 @@ else
$version = $_;
}
-$program =~ s!.*/!!;
-
# No info for `info' itself.
$opt_no_info = 1 if $program eq 'info';
+if ($opt_name)
+{
+ # --name overrides --include contents.
+ $replace{_('NAME')} = "$program \\- $opt_name\n";
+}
+
# Translators: "NAME", "SYNOPSIS" and other one or two word strings in all
# upper case are manual page section headings. The man(1) manual page in your
# language, if available should provide the conventional translations.
-for ($include{_('NAME')})
+for ($replace{_('NAME')} || ($include{_('NAME')} ||= ''))
{
- if ($opt_name) # --name overrides --include contents.
- {
- $_ = "$program \\- $opt_name\n";
- }
- elsif ($_) # Use first name given as $program
+ if ($_) # Use first name given as $program
{
$program = $1 if /^([^\s,]+)(?:,?\s*[^\s,\\-]+)*\s+\\?-/;
}
@@ -339,10 +385,11 @@ if ($help_text =~ s/^($PAT_USAGE):( +(\S+))(.*)((?:\n(?: {6}\1| *($PAT_USAGE_CON
s/\\fI$//;
s/^\./\\&./;
+ $_ = fix_italic_spacing $_;
$synopsis .= "$_\n";
}
- $include{_('SYNOPSIS')} ||= $synopsis;
+ $include{_('SYNOPSIS')} .= $synopsis;
}
# Process text, initial section is DESCRIPTION.
@@ -371,13 +418,13 @@ s/\\/\x82/g;
# "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an
# optional word, so that either "Report bugs" or "Report _program_ bugs" will
# be matched.
-my $PAT_BUGS = _('Report +(?:[\w-]+ +)?bugs|Email +bug +reports +to');
-my $PAT_AUTHOR = _('Written +by');
-my $PAT_OPTIONS = _('Options');
-my $PAT_ENVIRONMENT = _('Environment');
-my $PAT_FILES = _('Files');
-my $PAT_EXAMPLES = _('Examples');
-my $PAT_FREE_SOFTWARE = _('This +is +free +software');
+my $PAT_BUGS = _('Report +(?:[\w-]+ +)?bugs|Email +bug +reports +to');
+my $PAT_AUTHOR = _('Written +by');
+my $PAT_OPTIONS = _('Options');
+my $PAT_ENVIRONMENT = _('Environment');
+my $PAT_FILES = _('Files');
+my $PAT_EXAMPLES = _('Examples');
+my $PAT_FREE_SOFTWARE = _('This +is +free +software');
# Start a new paragraph (if required) for these.
s/([^\n])\n($PAT_BUGS|$PAT_AUTHOR) /$1\n\n$2 /og;
@@ -386,33 +433,40 @@ s/([^\n])\n($PAT_BUGS|$PAT_AUTHOR) /$1\n\n$2 /og;
# character.
s/^Copyright +(?:\xa9|\([Cc]\))/Copyright \\(co/mg;
-sub convert_option;
-
while (length)
{
# Convert some standard paragraph names.
- if (s/^($PAT_OPTIONS): *\n//o)
+ if (s/^($PAT_OPTIONS): *\n+//o)
{
$sect = _('OPTIONS');
next;
}
- if (s/^($PAT_ENVIRONMENT): *\n//o)
+ if (s/^($PAT_ENVIRONMENT): *\n+//o)
{
$sect = _('ENVIRONMENT');
next;
}
- if (s/^($PAT_FILES): *\n//o)
+ if (s/^($PAT_FILES): *\n+//o)
{
$sect = _('FILES');
next;
}
- elsif (s/^($PAT_EXAMPLES): *\n//o)
+ elsif (s/^($PAT_EXAMPLES): *\n+//o)
{
$sect = _('EXAMPLES');
next;
}
- # Copyright section
+ # Custom section indicated by a line containing "*Section Name*".
+ if (s/^\*(\w(.*\w)?)\* *\n+//)
+ {
+ $sect = uc $1;
+ $sect =~ tr/*/ /; # also accept *Section*Name*
+ push @sections, $sect;
+ next;
+ }
+
+ # Copyright section.
if (/^Copyright /)
{
$sect = _('COPYRIGHT');
@@ -437,7 +491,6 @@ while (length)
my $indent = $1;
my $prefix = $2;
my $break = '.IP';
- $include{$sect} ||= '';
while (s/^$indent\Q$prefix\E(\S.*)\n*//)
{
$include{$sect} .= "$break\n\\f(CW$prefix$1\\fR\n";
@@ -448,12 +501,11 @@ while (length)
}
my $matched = '';
- $include{$sect} ||= '';
# Sub-sections have a trailing colon and the second line indented.
if (s/^(\S.*:) *\n / /)
{
- $matched .= $& if %append;
+ $matched .= $& if %append_match;
$include{$sect} .= qq(.SS "$1"\n);
}
@@ -463,7 +515,7 @@ while (length)
# Option with description.
if (s/^( {1,10}([+-]\S.*?))(?:( +(?!-))|\n( {20,}))(\S.*)\n//)
{
- $matched .= $& if %append;
+ $matched .= $& if %append_match;
$indent = length ($4 || "$1$3");
$content = ".TP\n\x84$2\n\x84$5\n";
unless ($4)
@@ -476,23 +528,23 @@ while (length)
# Option without description.
elsif (s/^ {1,10}([+-]\S.*)\n//)
{
- $matched .= $& if %append;
+ $matched .= $& if %append_match;
$content = ".HP\n\x84$1\n";
$indent = 80; # not continued
}
# Indented paragraph with tag.
- elsif (s/^( +(\S.*?) +)(\S.*)\n//)
+ elsif (s/^( +(\S.*?))(?:( +)|\n( {20,}))(\S.*)\n//)
{
- $matched .= $& if %append;
- $indent = length $1;
- $content = ".TP\n\x84$2\n\x84$3\n";
+ $matched .= $& if %append_match;
+ $indent = length ($4 || "$1$3");
+ $content = ".TP\n\x84$2\n\x84$5\n";
}
# Indented paragraph.
elsif (s/^( +)(\S.*)\n//)
{
- $matched .= $& if %append;
+ $matched .= $& if %append_match;
$indent = length $1;
$content = ".IP\n\x84$2\n";
}
@@ -501,7 +553,7 @@ while (length)
else
{
s/(.*)\n//;
- $matched .= $& if %append;
+ $matched .= $& if %append_match;
$content = ".PP\n" if $include{$sect};
$content .= "$1\n";
}
@@ -509,7 +561,7 @@ while (length)
# Append continuations.
while ($indent ? s/^ {$indent}(\S.*)\n// : s/^(\S.*)\n//)
{
- $matched .= $& if %append;
+ $matched .= $& if %append_match;
$content .= "\x84$1\n";
}
@@ -523,19 +575,35 @@ while (length)
s/\x84'/\x81/g;
s/\x84//g;
- # Convert options.
- s/(^| |\()(-[][\w=-]+)/$1 . convert_option $2/mge;
+ # Examples should be verbatim.
+ unless ($sect eq _('EXAMPLES'))
+ {
+ # Convert options.
+ s/(^|[ (])(-[][\w=-]+)/$1 . convert_option $2/mge;
+
+ # Italicise filenames: /a/b, $VAR/c/d, ~/e/f
+ s!
+ (^|[ (]) # space/punctuation before
+ (
+ (?:\$\w+|~)? # leading variable, or tilde
+ (?:/\w(?:[\w.-]*\w)?)+ # path components
+ )
+ ($|[ ,;.)]) # space/punctuation after
+ !$1\\fI$2\\fP$3!xmg;
+
+ $_ = fix_italic_spacing $_;
+ }
- # Escape remaining hyphens
+ # Escape remaining hyphens.
s/-/\x83/g;
- if ($sect eq 'COPYRIGHT')
+ if ($sect eq _('COPYRIGHT'))
{
# Insert line breaks before additional copyright messages
# and the disclaimer.
s/\n(Copyright |$PAT_FREE_SOFTWARE)/\n.br\n$1/og;
}
- elsif ($sect eq 'REPORTING BUGS')
+ elsif ($sect eq _('REPORTING BUGS'))
{
# Handle multi-line bug reporting sections of the form:
#
@@ -547,14 +615,14 @@ while (length)
}
# Check if matched paragraph contains /pat/.
- if (%append)
+ if (%append_match)
{
- for my $pat (keys %append)
+ for my $pat (keys %append_match)
{
if ($matched =~ $pat)
{
- $content .= ".PP\n" unless $append{$pat} =~ /^\./;
- $content .= $append{$pat};
+ $content .= ".PP\n" unless $append_match{$pat} =~ /^\./;
+ $content .= $append_match{$pat};
}
}
}
@@ -568,7 +636,6 @@ unless ($opt_no_info)
my $info_page = $opt_info || $program;
$sect = _('SEE ALSO');
- $include{$sect} ||= '';
$include{$sect} .= ".PP\n" if $include{$sect};
$include{$sect} .= sprintf _(<<'EOT'), $program, $program, $info_page;
The full documentation for
@@ -585,6 +652,18 @@ should give you access to the complete manual.
EOT
}
+# Append additional text.
+while (my ($sect, $text) = each %append)
+{
+ $include{$sect} .= $append{$sect};
+}
+
+# Replace sections.
+while (my ($sect, $text) = each %replace)
+{
+ $include{$sect} = $replace{$sect};
+}
+
# Output header.
print < 1 } @pre, @post;
# Output content.
-for my $sect (@pre, (grep ! /^($filter)$/o, @include), @post)
+my %done;
+for my $sect (@pre, (grep !$filter{$_}, @sections), @post)
{
+ next if $done{$sect}++; # ignore duplicates
+ next unless $include{$sect};
if ($include{$sect})
{
my $quote = $sect =~ /\W/ ? '"' : '';
@@ -628,6 +709,15 @@ close STDOUT or kark N_("%s: error writing to %s (%s)"), $this_program,
exit;
+# Get program basename, and strip libtool "lt-" prefix if required.
+sub program_basename
+{
+ local $_ = shift;
+ s!.*/!!;
+ s/^lt-// if $opt_libtool;
+ $_;
+}
+
# Call program with given option and return results.
sub get_option_value
{
@@ -648,7 +738,7 @@ sub get_option_value
kark $err, $this_program, $opt, $prog, $extra;
}
- return $value;
+ $value;
}
# Convert option dashes to \- to stop nroff from hyphenating 'em, and
@@ -667,3 +757,12 @@ sub convert_option
$_;
}
+
+# Insert spacing escape characters \, and \/ before and after italic text. See
+# http://www.gnu.org/software/groff/manual/html_node/Ligatures-and-Kerning.html
+sub fix_italic_spacing
+{
+ local $_ = shift;
+ s!\\fI(.*?)\\f([BRP])!\\fI\\,$1\\/\\f$2!g;
+ return $_;
+}
--
cgit v1.2.1
From 236cb06666a44f23157aa95adc26450fdec92126 Mon Sep 17 00:00:00 2001
From: Michael Haubenwallner
Date: Thu, 17 Aug 2017 14:12:20 +0200
Subject: automake: Ensure that LIBOBJ_DIR builddir is created
* t/libobj-no-dependency-tracking.sh: New test reproducing the issue
described in automake bug#27781.
* t/list-of-tests.mk (handwritten_TESTS, XFAIL_TESTS): Add it.
---
t/libobj-no-dependency-tracking.sh | 56 ++++++++++++++++++++++++++++++++++++++
t/list-of-tests.mk | 2 ++
2 files changed, 58 insertions(+)
create mode 100644 t/libobj-no-dependency-tracking.sh
diff --git a/t/libobj-no-dependency-tracking.sh b/t/libobj-no-dependency-tracking.sh
new file mode 100644
index 000000000..1f024057e
--- /dev/null
+++ b/t/libobj-no-dependency-tracking.sh
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2017 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+# Ensure that LIBOBJS source files are properly built without dependency
+# tracking when using out of tree builds.
+#
+# This is a non regression test which is following an issue in flex-2.6.4 when
+# "malloc.o" was required, see .
+
+. test-init.sh
+
+# The LIBOBJS are in a separate LIBOBJ_DIR directory without anything else in
+# it to not trigger the creation of the build directory accidentally.
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AC_CONFIG_LIBOBJ_DIR([foo])
+AC_LIBOBJ([foo])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = helldl
+LDADD = $(LIBOBJS)
+.PHONY: dummy
+dummy: $(LIBOBJS)
+END
+
+mkdir foo
+cat > foo/foo.c << 'END'
+int foo() { return 0; }
+END
+
+mkdir build
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+cd build
+../configure --disable-dependency-tracking
+run_make dummy
+:
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index dacdc8dd8..dab4a7c20 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -38,6 +38,7 @@ t/override-conditional-pr13940.sh \
t/dist-pr109765.sh \
t/instdir-cond2.sh \
t/java-nobase.sh \
+t/libobj-no-dependency-tracking.sh \
t/objext-pr10128.sh \
t/remake-timing-bug-pr8365.sh \
t/lex-subobj-nodep.sh \
@@ -602,6 +603,7 @@ t/lflags.sh \
t/lflags-cxx.sh \
t/libexec.sh \
t/libobj-basic.sh \
+t/libobj-no-dependency-tracking.sh \
t/libobj2.sh \
t/libobj3.sh \
t/libobj4.sh \
--
cgit v1.2.1
From 5521219348c55af354878583b99c5f9d66d6d38a Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Sun, 27 Aug 2017 15:27:00 +0200
Subject: automake: Handle LTLIBOBJS more specifically
* bin/automake.in (handle_LIBOBJS_or_ALLOCA): Remove complex regexp
substitution when handling LTLIBOBJS.
---
bin/automake.in | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/bin/automake.in b/bin/automake.in
index d126836a0..cdea38856 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -2306,9 +2306,8 @@ sub handle_LIBOBJS_or_ALLOCA
if $relative_dir ne '.';
define_variable ('LIBOBJDIR', "$dir", INTERNAL);
$clean_files{"\$($var)"} = MOSTLY_CLEAN;
- # If LTLIBOBJS is used, we must also clear LIBOBJS (which might
- # be created by libtool as a side-effect of creating LTLIBOBJS).
- $clean_files{"\$($var)"} = MOSTLY_CLEAN if $var =~ s/^LT//;
+ # libtool might create LIBOBJS as a side-effect of using LTLIBOBJS.
+ $clean_files{"\$(LIBOBJS)"} = MOSTLY_CLEAN if $var eq "LTLIBOBJS";
}
else
{
--
cgit v1.2.1
From bb64793a95ea0576c817a8e01f0a689d9547de4a Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Tue, 29 Aug 2017 11:27:52 +0200
Subject: build: Move wrapped scripts in "bin" directory
Those scripts are used both in the build process and for the tests, so
it seems clearer to not hide them in "t/wrap" directory.
* t/wrap/aclocal.in: Rename to ...
* bin/wrap-aclocal.in: ... this.
* t/wrap/automake.in: Rename to ...
* bin/wrap-automake.in: ... this.
* configure.ac: Generate "bin/aclocal-${APIVERSION}" and
"bin/automake-${APIVERSION}" at configure time.
* t/Makefile.inc (nodist_noinst_SCRIPTS): Move wrapped scripts ...
* bin/Makefile.inc (nodist_noinst_SCRIPTS): ... here.
* Makefile.am (extend_PATH): Use "bin" directory.
* t/ax/test-defs.in (am_bindir): Likewise.
* t/get-sysconf.sh: Likewise.
* .gitignore: Update.
---
.gitignore | 4 ++--
Makefile.am | 2 +-
bin/Makefile.inc | 4 ++++
bin/wrap-aclocal.in | 29 +++++++++++++++++++++++++++++
bin/wrap-automake.in | 27 +++++++++++++++++++++++++++
configure.ac | 12 ++++++------
t/Makefile.inc | 4 ----
t/ax/test-defs.in | 2 +-
t/get-sysconf.sh | 4 ++--
t/wrap/aclocal.in | 29 -----------------------------
t/wrap/automake.in | 27 ---------------------------
11 files changed, 72 insertions(+), 72 deletions(-)
create mode 100644 bin/wrap-aclocal.in
create mode 100644 bin/wrap-automake.in
delete mode 100644 t/wrap/aclocal.in
delete mode 100644 t/wrap/automake.in
diff --git a/.gitignore b/.gitignore
index 19da02f71..56bdce2c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,9 @@
/config.status.lineno
/configure.lineno
/bin/aclocal
+/bin/aclocal-1.*
/bin/automake
+/bin/automake-1.*
/runtest
/doc/.dirstamp
/doc/automake*.info
@@ -41,8 +43,6 @@
/doc/web-manual
/lib/Automake/Config.pm
/test-suite.log
-/t/wrap/aclocal-1.*
-/t/wrap/automake-1.*
/t/ax/test-defs.sh
/t/ax/shell-no-trail-bslash
/t/ax/cc-no-c-o
diff --git a/Makefile.am b/Makefile.am
index cfe4dd40d..65787e030 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,7 @@ generated_file_finalize = $(AM_V_at) \
# For some tests or targets, we need to have the just-build automake and
# aclocal scripts avaiable on PATH.
extend_PATH = \
- { PATH='$(abs_builddir)/t/wrap$(PATH_SEPARATOR)'$$PATH && export PATH; }
+ { PATH='$(abs_builddir)/bin$(PATH_SEPARATOR)'$$PATH && export PATH; }
# The master location for INSTALL is lib/INSTALL.
# This is where "make fetch" will install new versions.
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 102dec9fc..69a744d87 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -20,6 +20,10 @@
bin_SCRIPTS = %D%/automake %D%/aclocal
CLEANFILES += $(bin_SCRIPTS)
+nodist_noinst_SCRIPTS += \
+ %D%/aclocal-$(APIVERSION) \
+ %D%/automake-$(APIVERSION)
+
# Used by maintainer checks and such.
automake_in = $(srcdir)/%D%/automake.in
aclocal_in = $(srcdir)/%D%/aclocal.in
diff --git a/bin/wrap-aclocal.in b/bin/wrap-aclocal.in
new file mode 100644
index 000000000..a624bcb16
--- /dev/null
+++ b/bin/wrap-aclocal.in
@@ -0,0 +1,29 @@
+#!@PERL@ -w
+# @configure_input@
+
+# Copyright (C) 2012-2017 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+BEGIN
+{
+ use strict;
+ @Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib');
+ unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib'
+ if '@srcdir@' ne '.';
+ unshift @ARGV,
+ '--automake-acdir=@abs_top_srcdir@/m4',
+ '--system-acdir=@abs_top_srcdir@/m4/acdir';
+}
+require '@abs_top_builddir@/bin/aclocal';
diff --git a/bin/wrap-automake.in b/bin/wrap-automake.in
new file mode 100644
index 000000000..1075346a1
--- /dev/null
+++ b/bin/wrap-automake.in
@@ -0,0 +1,27 @@
+#!@PERL@ -w
+# @configure_input@
+
+# Copyright (C) 2012-2017 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+BEGIN
+{
+ use strict;
+ @Automake::perl_libdirs = ('@abs_top_srcdir@/lib');
+ unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib'
+ if '@srcdir@' ne '.';
+ unshift @ARGV, '--libdir=@abs_top_srcdir@/lib';
+}
+require '@abs_top_builddir@/bin/automake';
diff --git a/configure.ac b/configure.ac
index 30ba7d97b..c9c257b37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,8 +67,8 @@ AC_SUBST([system_acdir], ["\${datadir}/aclocal"])
# aclocal and automake, hence the remake rules must use those versions
# as well. The extra quoting is to cater to cases when the build
# directory contains whitespace or shell metacharacters.
-ACLOCAL="\"`pwd`/t/wrap/aclocal-$APIVERSION\""
-AUTOMAKE="\"`pwd`/t/wrap/automake-$APIVERSION\""
+ACLOCAL="\"`pwd`/bin/aclocal-$APIVERSION\""
+AUTOMAKE="\"`pwd`/bin/automake-$APIVERSION\""
AC_PROG_LN_S
@@ -580,11 +580,11 @@ AC_SUBST([EXEEXT])
AC_CONFIG_FILES([Makefile])
AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
-AC_CONFIG_FILES([t/wrap/aclocal-${APIVERSION}:t/wrap/aclocal.in],
- [chmod +x t/wrap/aclocal-${APIVERSION}],
+AC_CONFIG_FILES([bin/aclocal-${APIVERSION}:bin/wrap-aclocal.in],
+ [chmod +x bin/aclocal-${APIVERSION}],
[APIVERSION=$APIVERSION])
-AC_CONFIG_FILES([t/wrap/automake-${APIVERSION}:t/wrap/automake.in],
- [chmod +x t/wrap/automake-${APIVERSION}],
+AC_CONFIG_FILES([bin/automake-${APIVERSION}:bin/wrap-automake.in],
+ [chmod +x bin/automake-${APIVERSION}],
[APIVERSION=$APIVERSION])
AC_OUTPUT
diff --git a/t/Makefile.inc b/t/Makefile.inc
index 708e93397..936108ed6 100644
--- a/t/Makefile.inc
+++ b/t/Makefile.inc
@@ -110,10 +110,6 @@ EXTRA_DIST += $(contrib_TESTS)
# "make all". This makes it easier to run the test cases by
# hand after having simply configured and built the package.
-nodist_noinst_SCRIPTS += \
- %D%/wrap/aclocal-$(APIVERSION) \
- %D%/wrap/automake-$(APIVERSION)
-
dist_noinst_DATA += \
%D%/ax/test-init.sh \
%D%/ax/test-lib.sh \
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in
index 2465c61c1..b4a690fc6 100644
--- a/t/ax/test-defs.in
+++ b/t/ax/test-defs.in
@@ -56,7 +56,7 @@ case ${am_running_installcheck:=no} in
no)
am_amdir=$am_top_srcdir/lib/am
am_automake_acdir=$am_top_srcdir/m4
- am_bindir=$am_top_builddir/t/wrap
+ am_bindir=$am_top_builddir/bin
am_datadir=$am_top_srcdir
am_docdir=$am_top_srcdir/doc
am_pkgvdatadir=$am_top_srcdir/lib
diff --git a/t/get-sysconf.sh b/t/get-sysconf.sh
index 986c1dd36..a768b4769 100644
--- a/t/get-sysconf.sh
+++ b/t/get-sysconf.sh
@@ -55,8 +55,8 @@ $YACC --version || :
$YACC --help || :
cat "$am_top_builddir/config.log" || st=1
-cat "$am_top_builddir/t/wrap/aclocal-$APIVERSION" || st=1
-cat "$am_top_builddir/t/wrap/automake-$APIVERSION" || st=1
+cat "$am_top_builddir/bin/aclocal-$APIVERSION" || st=1
+cat "$am_top_builddir/bin/automake-$APIVERSION" || st=1
if test $st -eq 0; then
# This test SKIPs, so that all the information it has gathered and
diff --git a/t/wrap/aclocal.in b/t/wrap/aclocal.in
deleted file mode 100644
index a624bcb16..000000000
--- a/t/wrap/aclocal.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!@PERL@ -w
-# @configure_input@
-
-# Copyright (C) 2012-2017 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-BEGIN
-{
- use strict;
- @Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib');
- unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib'
- if '@srcdir@' ne '.';
- unshift @ARGV,
- '--automake-acdir=@abs_top_srcdir@/m4',
- '--system-acdir=@abs_top_srcdir@/m4/acdir';
-}
-require '@abs_top_builddir@/bin/aclocal';
diff --git a/t/wrap/automake.in b/t/wrap/automake.in
deleted file mode 100644
index 1075346a1..000000000
--- a/t/wrap/automake.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!@PERL@ -w
-# @configure_input@
-
-# Copyright (C) 2012-2017 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-BEGIN
-{
- use strict;
- @Automake::perl_libdirs = ('@abs_top_srcdir@/lib');
- unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib'
- if '@srcdir@' ne '.';
- unshift @ARGV, '--libdir=@abs_top_srcdir@/lib';
-}
-require '@abs_top_builddir@/bin/automake';
--
cgit v1.2.1
From 64031f2aaf721043eff0aecec840bce71cec97ae Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Sun, 27 Aug 2017 17:41:50 +0200
Subject: build: Add 'pre-inst-env' wrapper script
This script allows someone building Automake from source to easily run
'automake' and 'aclocal' without having to install it or knowing the
existence of "wrapped" scripts in "bin" directory.
* pre-inst-env.in: New script.
* configure.ac: Generate 'pre-inst-env' at configure time.
* Makefile.am (nodist_noinst_SCRIPTS, CLEANFILES): Add it.
---
Makefile.am | 4 ++++
configure.ac | 1 +
pre-inst-env.in | 32 ++++++++++++++++++++++++++++++++
3 files changed, 37 insertions(+)
create mode 100644 pre-inst-env.in
diff --git a/Makefile.am b/Makefile.am
index 65787e030..bdcafd933 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,6 +69,10 @@ generated_file_finalize = $(AM_V_at) \
fi; \
chmod a-w $@-t && mv -f $@-t $@
+# Wrapper for the build environment.
+nodist_noinst_SCRIPTS += pre-inst-env
+CLEANFILES += $(noinst_SCRIPTS)
+
# For some tests or targets, we need to have the just-build automake and
# aclocal scripts avaiable on PATH.
extend_PATH = \
diff --git a/configure.ac b/configure.ac
index c9c257b37..e936e9e00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -580,6 +580,7 @@ AC_SUBST([EXEEXT])
AC_CONFIG_FILES([Makefile])
AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
+AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
AC_CONFIG_FILES([bin/aclocal-${APIVERSION}:bin/wrap-aclocal.in],
[chmod +x bin/aclocal-${APIVERSION}],
[APIVERSION=$APIVERSION])
diff --git a/pre-inst-env.in b/pre-inst-env.in
new file mode 100644
index 000000000..1599c7b5d
--- /dev/null
+++ b/pre-inst-env.in
@@ -0,0 +1,32 @@
+#! /bin/sh
+# Copyright © 2017 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+abs_top_srcdir="@abs_top_srcdir@"
+abs_top_builddir="@abs_top_builddir@"
+
+sep='@PATH_SEPARATOR@';
+
+PERL5LIB="$abs_top_builddir/lib/${sep}$abs_top_srcdir/lib/${PERL5LIB:+${sep}}$PERL5LIB"
+export PERL5LIB
+
+PATH="$abs_top_builddir/bin${sep}$PATH"
+export PATH
+
+# Trigger the use of local modules.
+AUTOMAKE_UNINSTALLED=1
+export AUTOMAKE_UNINSTALLED
+
+exec "$@"
--
cgit v1.2.1
From 361f25da9cdfa390bcfde88f31c71e7403bb2f3b Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Tue, 29 Aug 2017 13:04:57 +0200
Subject: build: Extend PATH from 'pre-inst-env' script
* configure.ac (ACLOCAL, AUTOMAKE): Use 'pre-inst-env'.
* Makefile.am (extend_PATH): Delete.
* doc/Makefile.inc (update_mans, $(srcdir)/%D%/amhello-1.0.tar.gz)
(setup_autotools_paths): Use 'pre-inst-env' instead of $(extend_PATH).
---
Makefile.am | 5 -----
configure.ac | 4 ++--
doc/Makefile.inc | 8 +++-----
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index bdcafd933..ab6533ea9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,11 +73,6 @@ generated_file_finalize = $(AM_V_at) \
nodist_noinst_SCRIPTS += pre-inst-env
CLEANFILES += $(noinst_SCRIPTS)
-# For some tests or targets, we need to have the just-build automake and
-# aclocal scripts avaiable on PATH.
-extend_PATH = \
- { PATH='$(abs_builddir)/bin$(PATH_SEPARATOR)'$$PATH && export PATH; }
-
# The master location for INSTALL is lib/INSTALL.
# This is where "make fetch" will install new versions.
# Make sure we also update this copy.
diff --git a/configure.ac b/configure.ac
index e936e9e00..7c8ecb4af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,8 +67,8 @@ AC_SUBST([system_acdir], ["\${datadir}/aclocal"])
# aclocal and automake, hence the remake rules must use those versions
# as well. The extra quoting is to cater to cases when the build
# directory contains whitespace or shell metacharacters.
-ACLOCAL="\"`pwd`/bin/aclocal-$APIVERSION\""
-AUTOMAKE="\"`pwd`/bin/automake-$APIVERSION\""
+ACLOCAL="\"`pwd`/pre-inst-env\" aclocal-$APIVERSION"
+AUTOMAKE="\"`pwd`/pre-inst-env\" automake-$APIVERSION"
AC_PROG_LN_S
diff --git a/doc/Makefile.inc b/doc/Makefile.inc
index 18c137c5b..807c29308 100644
--- a/doc/Makefile.inc
+++ b/doc/Makefile.inc
@@ -38,8 +38,7 @@ EXTRA_DIST += %D%/help2man
update_mans = \
$(AM_V_GEN): \
&& $(MKDIR_P) %D% \
- && $(extend_PATH) \
- && $(PERL) $(srcdir)/%D%/help2man --output=$@
+ && ./pre-inst-env $(PERL) $(srcdir)/%D%/help2man --output=$@
%D%/aclocal.1 %D%/automake.1:
$(AM_V_GEN): \
@@ -78,8 +77,7 @@ dist_noinst_DATA += $(amhello_sources)
dist_doc_DATA = $(srcdir)/%D%/amhello-1.0.tar.gz
setup_autotools_paths = { \
- $(extend_PATH) \
- && ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \
+ ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \
&& AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE \
&& AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF \
&& AUTOM4TE='$(am_AUTOM4TE)' && export AUTOM4TE \
@@ -98,7 +96,7 @@ $(srcdir)/%D%/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac
&& $(setup_autotools_paths) \
&& ( \
{ $(AM_V_P) || exec 5>&2 >$$tmp 2>&1; } \
- && $(am_AUTORECONF) -vfi \
+ && $(abs_builddir)/pre-inst-env $(am_AUTORECONF) -vfi \
&& ./configure \
&& $(MAKE) $(AM_MAKEFLAGS) distcheck \
&& $(MAKE) $(AM_MAKEFLAGS) distclean \
--
cgit v1.2.1
From 37d403fd06596cd27ffd22d5d9796af811841305 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Tue, 29 Aug 2017 13:23:24 +0200
Subject: build: Use PERL5LIB from 'pre-inst-env' script
* bin/aclocal.in: Detect build environment with AUTOMAKE_UNINSTALLED.
Let 'PERL5LIB' from 'pre-inst-env' define the perl module directories.
* bin/automake.in: Likewise.
* bin/wrap-aclocal.in: Don't set 'Automake::perl_libdirs' anymore.
* bin/wrap-automake.in: Likewise.
* t/Makefile.inc (LOG_COMPILER, PL_LOG_COMPILER): Use 'pre-inst-env'.
(AM_PL_LOG_FLAGS): Don't set perl module path.
---
bin/aclocal.in | 5 ++---
bin/automake.in | 5 ++---
bin/wrap-aclocal.in | 3 ---
bin/wrap-automake.in | 3 ---
t/Makefile.inc | 6 +++---
5 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/bin/aclocal.in b/bin/aclocal.in
index 7350c8e38..abd352376 100644
--- a/bin/aclocal.in
+++ b/bin/aclocal.in
@@ -27,9 +27,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
BEGIN
{
- @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
- unless @Aclocal::perl_libdirs;
- unshift @INC, @Aclocal::perl_libdirs;
+ unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
+ unless $ENV{AUTOMAKE_UNINSTALLED};
}
use strict;
diff --git a/bin/automake.in b/bin/automake.in
index cdea38856..ad86cf4a8 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -31,9 +31,8 @@ use strict;
BEGIN
{
- @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
- unless @Automake::perl_libdirs;
- unshift @INC, @Automake::perl_libdirs;
+ unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@')
+ unless $ENV{AUTOMAKE_UNINSTALLED};
# Override SHELL. This is required on DJGPP so that system() uses
# bash, not COMMAND.COM which doesn't quote arguments properly.
diff --git a/bin/wrap-aclocal.in b/bin/wrap-aclocal.in
index a624bcb16..2fcccb4a2 100644
--- a/bin/wrap-aclocal.in
+++ b/bin/wrap-aclocal.in
@@ -19,9 +19,6 @@
BEGIN
{
use strict;
- @Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib');
- unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib'
- if '@srcdir@' ne '.';
unshift @ARGV,
'--automake-acdir=@abs_top_srcdir@/m4',
'--system-acdir=@abs_top_srcdir@/m4/acdir';
diff --git a/bin/wrap-automake.in b/bin/wrap-automake.in
index 1075346a1..a363dbc7c 100644
--- a/bin/wrap-automake.in
+++ b/bin/wrap-automake.in
@@ -19,9 +19,6 @@
BEGIN
{
use strict;
- @Automake::perl_libdirs = ('@abs_top_srcdir@/lib');
- unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib'
- if '@srcdir@' ne '.';
unshift @ARGV, '--libdir=@abs_top_srcdir@/lib';
}
require '@abs_top_builddir@/bin/automake';
diff --git a/t/Makefile.inc b/t/Makefile.inc
index 936108ed6..6b3b62fed 100644
--- a/t/Makefile.inc
+++ b/t/Makefile.inc
@@ -20,13 +20,13 @@
## ------------ ##
# Run the tests with a proper shell detected at configure time.
-LOG_COMPILER = $(AM_TEST_RUNNER_SHELL)
+LOG_COMPILER = ./pre-inst-env $(AM_TEST_RUNNER_SHELL)
TEST_EXTENSIONS = .pl .sh .tap
SH_LOG_COMPILER = $(LOG_COMPILER)
TAP_LOG_COMPILER = $(LOG_COMPILER)
-PL_LOG_COMPILER = $(PERL)
-AM_PL_LOG_FLAGS = -Mstrict -I $(builddir)/lib -I $(srcdir)/lib -w
+PL_LOG_COMPILER = ./pre-inst-env $(PERL)
+AM_PL_LOG_FLAGS = -Mstrict -w
TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(srcdir)/lib/tap-driver.sh
--
cgit v1.2.1
From dd0b8142683d35bdb7e04cc15ece43039ede2a41 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Tue, 29 Aug 2017 14:16:24 +0200
Subject: config: Support AUTOMAKE_LIBDIR environment variable
* lib/Automake/Config.in: Let AUTOMAKE_LIBDIR environment variable
override the default location for '$libdir'.
* doc/automake.texi (automake Invocation): Document AUTOMAKE_LIBDIR.
* pre-inst-env.in (AUTOMAKE_LIBDIR): Set AUTOMAKE_LIBDIR.
* bin/wrap-automake.in: Don't use "--libdir" option.
---
bin/wrap-automake.in | 5 -----
doc/automake.texi | 5 +++++
lib/Automake/Config.in | 2 +-
pre-inst-env.in | 3 +++
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/bin/wrap-automake.in b/bin/wrap-automake.in
index a363dbc7c..09b1b30f8 100644
--- a/bin/wrap-automake.in
+++ b/bin/wrap-automake.in
@@ -16,9 +16,4 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-BEGIN
-{
- use strict;
- unshift @ARGV, '--libdir=@abs_top_srcdir@/lib';
-}
require '@abs_top_builddir@/bin/automake';
diff --git a/doc/automake.texi b/doc/automake.texi
index 544f7c1e4..1f0b7e581 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -2579,6 +2579,11 @@ for more information.
Look for Automake data files in directory @var{dir} instead of in the
installation directory. This is typically used for debugging.
+@vindex AUTOMAKE_LIBDIR
+The environment variable @env{AUTOMAKE_LIBDIR} provides another way to
+set the directory containing Automake data files. However
+@option{--libdir} takes precedence over it.
+
@item --print-libdir
@opindex --print-libdir
Print the path of the installation directory containing Automake-provided
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index 9437eca9d..a22fdc0f7 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -32,7 +32,7 @@ our $PACKAGE = '@PACKAGE@';
our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
our $VERSION = '@VERSION@';
our $RELEASE_YEAR = '@RELEASE_YEAR@';
-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
+our $libdir = $ENV{"AUTOMAKE_LIBDIR"} || '@datadir@/@PACKAGE@-@APIVERSION@';
our $perl_threads = 0;
# We need at least this version for CLONE support.
diff --git a/pre-inst-env.in b/pre-inst-env.in
index 1599c7b5d..880012cce 100644
--- a/pre-inst-env.in
+++ b/pre-inst-env.in
@@ -29,4 +29,7 @@ export PATH
AUTOMAKE_UNINSTALLED=1
export AUTOMAKE_UNINSTALLED
+AUTOMAKE_LIBDIR="$abs_top_srcdir/lib"
+export AUTOMAKE_LIBDIR
+
exec "$@"
--
cgit v1.2.1
From ab2d33e635f85f8f215b7e8f14571ec6360d2243 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Tue, 29 Aug 2017 21:15:14 +0200
Subject: aclocal: Support ACLOCAL_AUTOMAKE_DIR environment variable
* bin/aclocal.in: Reset '@automake_includes' and '@system_includes' in
for build environment. Allow setting '@automake_includes' with
ACLOCAL_AUTOMAKE_DIR environment variable.
(parse_arguments): Ignore 'dirlist' when '@system_includes' is empty.
* doc/automake.texi (aclocal Options): Document ACLOCAL_AUTOMAKE_DIR.
* bin/wrap-aclocal.in: Remove extra command line options.
* pre-inst-env.in: Set ACLOCAL_AUTOMAKE_DIR and ACLOCAL_PATH
environment variables.
* t/ax/test-defs.in: Adapt.
* t/ansi2knr-no-more.sh (warn_rx): Likewise.
---
bin/aclocal.in | 12 +++++++++++-
bin/wrap-aclocal.in | 7 -------
doc/automake.texi | 5 +++++
pre-inst-env.in | 6 ++++++
t/ansi2knr-no-more.sh | 2 +-
t/ax/test-defs.in | 4 ++--
6 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/bin/aclocal.in b/bin/aclocal.in
index abd352376..738996f39 100644
--- a/bin/aclocal.in
+++ b/bin/aclocal.in
@@ -1111,7 +1111,7 @@ sub parse_arguments ()
}
# Finally, adds any directory listed in the 'dirlist' file.
- if (open (DIRLIST, "$system_includes[0]/dirlist"))
+ if (@system_includes && open (DIRLIST, "$system_includes[0]/dirlist"))
{
while ()
{
@@ -1146,6 +1146,16 @@ sub parse_ACLOCAL_PATH ()
################################################################
+# Don't refer to installation directories from the build environment
+if (exists $ENV{"AUTOMAKE_UNINSTALLED"})
+ {
+ @automake_includes = ();
+ @system_includes = ();
+ }
+
+@automake_includes = ($ENV{"ACLOCAL_AUTOMAKE_DIR"})
+ if (exists $ENV{"ACLOCAL_AUTOMAKE_DIR"});
+
parse_WARNINGS; # Parse the WARNINGS environment variable.
parse_arguments;
parse_ACLOCAL_PATH;
diff --git a/bin/wrap-aclocal.in b/bin/wrap-aclocal.in
index 2fcccb4a2..e6e4782d2 100644
--- a/bin/wrap-aclocal.in
+++ b/bin/wrap-aclocal.in
@@ -16,11 +16,4 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-BEGIN
-{
- use strict;
- unshift @ARGV,
- '--automake-acdir=@abs_top_srcdir@/m4',
- '--system-acdir=@abs_top_srcdir@/m4/acdir';
-}
require '@abs_top_builddir@/bin/aclocal';
diff --git a/doc/automake.texi b/doc/automake.texi
index 1f0b7e581..dbe222d20 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -3221,6 +3221,11 @@ overridden using the @env{AUTOM4TE} environment variable.
Look for the automake-provided macro files in @var{dir} instead of
in the installation directory. This is typically used for debugging.
+@vindex ACLOCAL_AUTOMAKE_DIR
+The environment variable @env{ACLOCAL_AUTOMAKE_DIR} provides another
+way to set the directory containing automake-provided macro files.
+However @option{--automake-acdir} takes precedence over it.
+
@item --system-acdir=@var{dir}
@opindex --system-acdir
Look for the system-wide third-party macro files (and the special
diff --git a/pre-inst-env.in b/pre-inst-env.in
index 880012cce..f285ca62c 100644
--- a/pre-inst-env.in
+++ b/pre-inst-env.in
@@ -32,4 +32,10 @@ export AUTOMAKE_UNINSTALLED
AUTOMAKE_LIBDIR="$abs_top_srcdir/lib"
export AUTOMAKE_LIBDIR
+ACLOCAL_AUTOMAKE_DIR="$abs_top_srcdir/m4"
+export ACLOCAL_AUTOMAKE_DIR
+
+ACLOCAL_PATH="$abs_top_srcdir/m4/acdir"
+export ACLOCAL_PATH
+
exec "$@"
diff --git a/t/ansi2knr-no-more.sh b/t/ansi2knr-no-more.sh
index f9128022b..8c13cd0a3 100644
--- a/t/ansi2knr-no-more.sh
+++ b/t/ansi2knr-no-more.sh
@@ -32,7 +32,7 @@ $ACLOCAL -Wnone 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep "^configure\\.ac:5:.*$warn_rx" stderr
-cat aclocal.sav "$am_automake_acdir"/obsolete.m4 > aclocal.m4
+cat aclocal.sav "$am_top_srcdir"/m4/obsolete.m4 > aclocal.m4
$AUTOCONF -Wnone 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep "^configure\\.ac:5:.*$warn_rx" stderr
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in
index b4a690fc6..8cace053b 100644
--- a/t/ax/test-defs.in
+++ b/t/ax/test-defs.in
@@ -55,13 +55,13 @@ case ${am_running_installcheck:=no} in
;;
no)
am_amdir=$am_top_srcdir/lib/am
- am_automake_acdir=$am_top_srcdir/m4
+ am_automake_acdir=""
am_bindir=$am_top_builddir/bin
am_datadir=$am_top_srcdir
am_docdir=$am_top_srcdir/doc
am_pkgvdatadir=$am_top_srcdir/lib
am_scriptdir=$am_top_srcdir/lib
- am_system_acdir=$am_top_srcdir/m4/acdir
+ am_system_acdir=""
;;
*)
echo "$me: variable 'am_running_installcheck' has invalid"
--
cgit v1.2.1
From 99cf7ca5ed35afa9552a3a2429963130700a0fde Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Wed, 30 Aug 2017 23:45:49 +0200
Subject: build: Generate versioned scripts at make time
* configure.ac: Don't generate 'bin/aclocal-${APIVERSION}' and
'bin/automake-${APIVERSION}'.
* bin/wrap-aclocal.in: Delete.
* bin/wrap-automake.in: Likewise.
* bin/Makefile.inc (%D%/automake-$(APIVERSION))
(%D%/aclocal-$(APIVERSION)): New targets.
(CLEANFILES): Add them.
---
bin/Makefile.inc | 15 +++++++++++++--
bin/wrap-aclocal.in | 19 -------------------
bin/wrap-automake.in | 19 -------------------
configure.ac | 8 --------
4 files changed, 13 insertions(+), 48 deletions(-)
delete mode 100644 bin/wrap-aclocal.in
delete mode 100644 bin/wrap-automake.in
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 69a744d87..62dd483d9 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -18,12 +18,15 @@
## ----------------------------------- ##
bin_SCRIPTS = %D%/automake %D%/aclocal
-CLEANFILES += $(bin_SCRIPTS)
-
nodist_noinst_SCRIPTS += \
%D%/aclocal-$(APIVERSION) \
%D%/automake-$(APIVERSION)
+CLEANFILES += \
+ $(bin_SCRIPTS) \
+ %D%/aclocal-$(APIVERSION) \
+ %D%/automake-$(APIVERSION)
+
# Used by maintainer checks and such.
automake_in = $(srcdir)/%D%/automake.in
aclocal_in = $(srcdir)/%D%/aclocal.in
@@ -72,4 +75,12 @@ uninstall-hook:
&& chmod a+x,a-w $@-t && mv -f $@-t $@
EXTRA_DIST += %D%/gen-perl-protos
+%D%/aclocal-$(APIVERSION): %D%/aclocal
+ $(AM_V_GEN) rm -f $@; \
+ $(LN) %D%/aclocal $@
+
+%D%/automake-$(APIVERSION): %D%/automake
+ $(AM_V_GEN) rm -f $@; \
+ $(LN) %D%/automake $@
+
# vim: ft=automake noet
diff --git a/bin/wrap-aclocal.in b/bin/wrap-aclocal.in
deleted file mode 100644
index e6e4782d2..000000000
--- a/bin/wrap-aclocal.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!@PERL@ -w
-# @configure_input@
-
-# Copyright (C) 2012-2017 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-require '@abs_top_builddir@/bin/aclocal';
diff --git a/bin/wrap-automake.in b/bin/wrap-automake.in
deleted file mode 100644
index 09b1b30f8..000000000
--- a/bin/wrap-automake.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!@PERL@ -w
-# @configure_input@
-
-# Copyright (C) 2012-2017 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-require '@abs_top_builddir@/bin/automake';
diff --git a/configure.ac b/configure.ac
index 7c8ecb4af..7f91f9609 100644
--- a/configure.ac
+++ b/configure.ac
@@ -579,15 +579,7 @@ AC_SUBST([EXEEXT])
AC_CONFIG_FILES([Makefile])
AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
-
AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
-AC_CONFIG_FILES([bin/aclocal-${APIVERSION}:bin/wrap-aclocal.in],
- [chmod +x bin/aclocal-${APIVERSION}],
- [APIVERSION=$APIVERSION])
-AC_CONFIG_FILES([bin/automake-${APIVERSION}:bin/wrap-automake.in],
- [chmod +x bin/automake-${APIVERSION}],
- [APIVERSION=$APIVERSION])
-
AC_OUTPUT
# Inform the user if this version of automake is a beta release or
--
cgit v1.2.1
From 574b20e518079db0f91720c0641e4222d9fda84f Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Sat, 8 Jul 2017 20:18:45 +0200
Subject: build: Inline perl prototypes in sources
Prototypes allows us to avoid using the '&foo' invocation form when
invoking a subroutine before its definition. Previously those
prototypes were generated to prevent them from falling out-of-sync
with actual definitions. Now we provide a 'check-perl-protos' lint
script to ensure that this is not the case. This has the same
benefits as generating prototypes while simplifying the
bootstrap/build process.
* bin/gen-perl-protos: Remove.
* bin/Makefile.inc: Adapt.
* bootstrap: Likewise.
* bin/aclocal.in: Inline prototypes.
* bin/automake.in: Likewise.
* maintainer/check-perl-protos: New lint script.
* maintainer/syntax-checks.mk (sc_perl_protos): New target.
(syntax_check_rules): Add it.
---
bin/Makefile.inc | 6 +----
bin/aclocal.in | 21 +++++++++++++++-
bin/automake.in | 57 ++++++++++++++++++++++++++++++++++++++++++--
bin/gen-perl-protos | 36 ----------------------------
bootstrap | 7 ++----
maintainer/check-perl-protos | 50 ++++++++++++++++++++++++++++++++++++++
maintainer/syntax-checks.mk | 8 +++++++
7 files changed, 136 insertions(+), 49 deletions(-)
delete mode 100755 bin/gen-perl-protos
create mode 100755 maintainer/check-perl-protos
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 62dd483d9..c63f670b8 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -61,19 +61,15 @@ uninstall-hook:
# $(datadir) or other do_subst'ituted variables change.
%D%/automake: %D%/automake.in
%D%/aclocal: %D%/aclocal.in
-%D%/automake %D%/aclocal: Makefile %D%/gen-perl-protos
+%D%/automake %D%/aclocal: Makefile
$(AM_V_GEN)rm -f $@ $@-t $@-t2 \
&& $(MKDIR_P) $(@D) \
## Common substitutions.
&& in=$@.in && $(do_subst) <$(srcdir)/$$in >$@-t \
-## Auto-compute prototypes of perl subroutines.
- && $(PERL) -w $(srcdir)/%D%/gen-perl-protos $@-t > $@-t2 \
- && mv -f $@-t2 $@-t \
## We can't use '$(generated_file_finalize)' here, because currently
## Automake contains occurrences of unexpanded @substitutions@ in
## comments, and that is perfectly legit.
&& chmod a+x,a-w $@-t && mv -f $@-t $@
-EXTRA_DIST += %D%/gen-perl-protos
%D%/aclocal-$(APIVERSION): %D%/aclocal
$(AM_V_GEN) rm -f $@; \
diff --git a/bin/aclocal.in b/bin/aclocal.in
index 738996f39..64fd66233 100644
--- a/bin/aclocal.in
+++ b/bin/aclocal.in
@@ -173,7 +173,26 @@ use constant SCAN_M4_DIRS_ERROR => 2;
# Prototypes for all subroutines.
-#! Prototypes here will automatically be generated by the build system.
+sub add_file ($);
+sub add_macro ($);
+sub check_acinclude ();
+sub install_file ($$);
+sub list_compare (\@\@);
+sub parse_ACLOCAL_PATH ();
+sub parse_arguments ();
+sub reset_maps ();
+sub scan_configure ();
+sub scan_configure_dep ($);
+sub scan_file ($$$);
+sub scan_m4_dirs ($$@);
+sub scan_m4_files ();
+sub strip_redundant_includes (%);
+sub trace_used_macros ();
+sub unlink_tmp (;$);
+sub usage ($);
+sub version ();
+sub write_aclocal ($@);
+sub xmkdir_p ($);
################################################################
diff --git a/bin/automake.in b/bin/automake.in
index ad86cf4a8..3433d3de7 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -80,8 +80,61 @@ use Carp;
## Subroutine prototypes. ##
## ----------------------- ##
-#! Prototypes here will automatically be generated by the build system.
-
+sub append_exeext (&$);
+sub check_gnits_standards ();
+sub check_gnu_standards ();
+sub check_trailing_slash ($\$);
+sub check_typos ();
+sub define_files_variable ($\@$$);
+sub define_standard_variables ();
+sub define_verbose_libtool ();
+sub define_verbose_texinfo ();
+sub do_check_merge_target ();
+sub get_number_of_threads ();
+sub handle_compile ();
+sub handle_data ();
+sub handle_dist ();
+sub handle_emacs_lisp ();
+sub handle_factored_dependencies ();
+sub handle_footer ();
+sub handle_gettext ();
+sub handle_headers ();
+sub handle_install ();
+sub handle_java ();
+sub handle_languages ();
+sub handle_libraries ();
+sub handle_libtool ();
+sub handle_ltlibraries ();
+sub handle_makefiles_serial ();
+sub handle_man_pages ();
+sub handle_minor_options ();
+sub handle_options ();
+sub handle_programs ();
+sub handle_python ();
+sub handle_scripts ();
+sub handle_silent ();
+sub handle_subdirs ();
+sub handle_tags ();
+sub handle_targets ();
+sub handle_tests ();
+sub handle_tests_dejagnu ();
+sub handle_texinfo ();
+sub handle_user_recursion ();
+sub initialize_per_input ();
+sub lang_lex_finish ();
+sub lang_sub_obj ();
+sub lang_vala_finish ();
+sub lang_yacc_finish ();
+sub locate_aux_dir ();
+sub parse_arguments ();
+sub scan_aclocal_m4 ();
+sub scan_autoconf_files ();
+sub silent_flag ();
+sub transform ($\%);
+sub transform_token ($\%$);
+sub usage ();
+sub version ();
+sub yacc_lex_finish_helper ();
## ----------- ##
## Constants. ##
diff --git a/bin/gen-perl-protos b/bin/gen-perl-protos
deleted file mode 100755
index 215d275b8..000000000
--- a/bin/gen-perl-protos
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env perl
-#
-# Copyright (C) 2013-2017 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
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-use warnings;
-use strict;
-
-my @lines = <>;
-my @protos = map { /^(sub \w+\s*\(.*\))/ ? ("$1;") : () } @lines;
-
-while (defined ($_ = shift @lines))
- {
- if (/^#!.* prototypes/i)
- {
- print "# BEGIN AUTOMATICALLY GENERATED PROTOTYPES\n";
- print join ("\n", sort @protos) . "\n";
- print "# END AUTOMATICALLY GENERATED PROTOTYPES\n";
- }
- else
- {
- print;
- }
- }
diff --git a/bootstrap b/bootstrap
index d0766d4c8..1382a9fe8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -103,11 +103,8 @@ dosubst automake-$APIVERSION/Automake/Config.in \
dosubst m4/amversion.in m4/amversion.m4
# Create temporary replacement for aclocal and automake.
-for p in bin/aclocal bin/automake; do
- dosubst $p.in $p.tmp
- $PERL -w bin/gen-perl-protos $p.tmp > $p.tmp2
- mv -f $p.tmp2 $p.tmp
-done
+dosubst bin/aclocal.in bin/aclocal.tmp
+dosubst bin/automake.in bin/automake.tmp
# Create required makefile snippets.
$PERL ./gen-testsuite-part > t/testsuite-part.tmp
diff --git a/maintainer/check-perl-protos b/maintainer/check-perl-protos
new file mode 100755
index 000000000..b1d6a72b5
--- /dev/null
+++ b/maintainer/check-perl-protos
@@ -0,0 +1,50 @@
+#!/usr/bin/env perl
+#
+# Copyright (C) 2017 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
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+use warnings;
+use strict;
+
+my @lines = <>;
+my %forwards = map { /^sub (\w+)\s*\((.*)\);$/ ? ("$1" => "$2") : () } @lines;
+my %subs = map { /^sub (\w+)\s*\((.*)\)$/ ? ("$1" => "$2") : () } @lines;
+my $error_count = 0;
+
+# $subs{"foo"} = "$$";
+# $subs{"bar"} = "@";
+# $forwards{"bar"} = "\$";
+
+# Check that every subroutine has a matching forward declaration with
+# the same prototype.
+foreach my $sub (keys (%subs))
+ {
+ # XXX: The location of the subroutine is not reported.
+ if (grep { $sub eq $_ } keys (%forwards))
+ {
+ if ($forwards{$sub} ne $subs{$sub})
+ {
+ $error_count += 1;
+ warn ("prototype mismatch for \"$sub\" subroutine\n");
+ }
+ }
+ else
+ {
+ $error_count += 1;
+ warn ("missing prototype for \"$sub\" subroutine\n");
+ }
+ }
+
+exit (($error_count == 0) ? 0 : 1);
diff --git a/maintainer/syntax-checks.mk b/maintainer/syntax-checks.mk
index c8b074008..07a12ab6f 100644
--- a/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@ -51,6 +51,7 @@ sc_mkinstalldirs \
sc_pre_normal_post_install_uninstall \
sc_perl_no_undef \
sc_perl_no_split_regex_space \
+sc_perl_protos \
sc_cd_in_backquotes \
sc_cd_relative_dir \
sc_perl_at_uscore_in_scalar_context \
@@ -102,6 +103,13 @@ sc_sanity_gnu_grep:
.PHONY: sc_sanity_gnu_grep
$(syntax_check_rules): sc_sanity_gnu_grep
+# Check that every subroutine in perl scripts has a corresponding
+# prototype
+sc_perl_protos:
+ $(AM_V_GEN)$(srcdir)/maintainer/check-perl-protos \
+ <$(srcdir)/bin/aclocal.in && \
+ $(srcdir)/maintainer/check-perl-protos <$(srcdir)/bin/automake.in
+
# These check avoids accidental configure substitutions in the source.
# There are exactly 8 lines that should be modified from automake.in to
# automake, and 9 lines that should be modified from aclocal.in to
--
cgit v1.2.1
From 20e898dc2b2c6cf0f22dc25d33a2f258f0423e9c Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Sat, 8 Jul 2017 22:32:19 +0200
Subject: maint: Define API version manually
* configure.ac (APIVERSION): Define it to 1.15a.
* bootstrap (APIVERSION): Parse 'configure.ac' to get it.
---
bootstrap | 5 +----
configure.ac | 7 +------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/bootstrap b/bootstrap
index 1382a9fe8..82f3859a2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -37,6 +37,7 @@ export AUTOM4TE # ditto
# Variables to substitute.
VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac`
+APIVERSION=`sed -n 's/^APIVERSION=//p' configure.ac`
PACKAGE=automake
datadir=.
# This should be automatically updated by the 'update-copyright'
@@ -52,10 +53,6 @@ else
BOOTSTRAP_SHELL=/bin/sh
fi
-# Read the rule for calculating APIVERSION and execute it.
-apiver_cmd=`sed -ne 's/\[\[/[/g;s/\]\]/]/g;/^APIVERSION=/p' configure.ac`
-eval "$apiver_cmd"
-
# Sanity checks.
if test -z "$VERSION"; then
echo "$me: cannot find VERSION" >&2
diff --git a/configure.ac b/configure.ac
index 7f91f9609..806dcce43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,12 +49,7 @@ AC_SUBST([RELEASE_YEAR])
# The API version is the base version. We must guarantee
# compatibility for all releases with the same API version.
-# Our current rule is that:
-# * All releases, including the prereleases, in an X.Y series
-# are compatible. So 1.5.1c is compatible with 1.5.
-# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c
-# aren't the same.
-APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]*\).*$/\1/'`
+APIVERSION=1.15a
AC_SUBST([APIVERSION])
AC_SUBST([pkgvdatadir], ["\${datadir}/$PACKAGE-$APIVERSION"])
--
cgit v1.2.1
From e94c0186d98d70df2f18c17622ee75f80f95e17b Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Thu, 31 Aug 2017 14:42:13 +0200
Subject: build: Rename "Makefile.inc" Makefile fragments to "local.mk"
This is done to follow a convention used by a lot of GNU packages.
* bin/Makefile.inc: Rename to ...
* bin/local.mk: ... this.
* doc/Makefile.inc: Rename to ...
* doc/local.mk: ... this.
* lib/Automake/Makefile.inc: Rename to ...
* lib/Automake/local.mk: ... this.
* lib/am/Makefile.inc: Rename to ...
* lib/am/local.mk: ... this.
* lib/Makefile.inc: Rename to ...
* lib/local.mk: ... this.
* m4/Makefile.inc: Rename to ...
* m4/local.mk: ... this.
* contrib/t/Makefile.inc: Rename to ...
* contrib/t/local.mk: ... this.
* t/Makefile.inc: Rename to ...
* t/local.mk: ... this. Adapt.
* Makefile.am: Adapt.
---
Makefile.am | 14 +--
bin/Makefile.inc | 82 --------------
bin/local.mk | 82 ++++++++++++++
contrib/t/Makefile.inc | 26 -----
contrib/t/local.mk | 26 +++++
doc/Makefile.inc | 115 --------------------
doc/local.mk | 115 ++++++++++++++++++++
lib/Automake/Makefile.inc | 57 ----------
lib/Automake/local.mk | 57 ++++++++++
lib/Makefile.inc | 67 ------------
lib/am/Makefile.inc | 65 -----------
lib/am/local.mk | 65 +++++++++++
lib/local.mk | 67 ++++++++++++
m4/Makefile.inc | 79 --------------
m4/local.mk | 79 ++++++++++++++
t/Makefile.inc | 268 ----------------------------------------------
t/local.mk | 268 ++++++++++++++++++++++++++++++++++++++++++++++
17 files changed, 766 insertions(+), 766 deletions(-)
delete mode 100644 bin/Makefile.inc
create mode 100644 bin/local.mk
delete mode 100644 contrib/t/Makefile.inc
create mode 100644 contrib/t/local.mk
delete mode 100644 doc/Makefile.inc
create mode 100644 doc/local.mk
delete mode 100644 lib/Automake/Makefile.inc
create mode 100644 lib/Automake/local.mk
delete mode 100644 lib/Makefile.inc
delete mode 100644 lib/am/Makefile.inc
create mode 100644 lib/am/local.mk
create mode 100644 lib/local.mk
delete mode 100644 m4/Makefile.inc
create mode 100644 m4/local.mk
delete mode 100644 t/Makefile.inc
create mode 100644 t/local.mk
diff --git a/Makefile.am b/Makefile.am
index ab6533ea9..89de362de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,12 +123,12 @@ EXTRA_DIST += \
maintainer/syntax-checks.mk
# Most work delegated to sub-dir makefile fragments.
-include $(srcdir)/bin/Makefile.inc
-include $(srcdir)/doc/Makefile.inc
-include $(srcdir)/lib/Makefile.inc
-include $(srcdir)/lib/Automake/Makefile.inc
-include $(srcdir)/lib/am/Makefile.inc
-include $(srcdir)/m4/Makefile.inc
-include $(srcdir)/t/Makefile.inc
+include $(srcdir)/bin/local.mk
+include $(srcdir)/doc/local.mk
+include $(srcdir)/lib/local.mk
+include $(srcdir)/lib/Automake/local.mk
+include $(srcdir)/lib/am/local.mk
+include $(srcdir)/m4/local.mk
+include $(srcdir)/t/local.mk
# vim: ft=automake noet
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
deleted file mode 100644
index c63f670b8..000000000
--- a/bin/Makefile.inc
+++ /dev/null
@@ -1,82 +0,0 @@
-## Copyright (C) 1995-2017 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
-
-## ----------------------------------- ##
-## The automake and aclocal scripts. ##
-## ----------------------------------- ##
-
-bin_SCRIPTS = %D%/automake %D%/aclocal
-nodist_noinst_SCRIPTS += \
- %D%/aclocal-$(APIVERSION) \
- %D%/automake-$(APIVERSION)
-
-CLEANFILES += \
- $(bin_SCRIPTS) \
- %D%/aclocal-$(APIVERSION) \
- %D%/automake-$(APIVERSION)
-
-# Used by maintainer checks and such.
-automake_in = $(srcdir)/%D%/automake.in
-aclocal_in = $(srcdir)/%D%/aclocal.in
-automake_script = %D%/automake
-aclocal_script = %D%/aclocal
-
-AUTOMAKESOURCES = $(automake_in) $(aclocal_in)
-TAGS_FILES += $(AUTOMAKESOURCES)
-EXTRA_DIST += $(AUTOMAKESOURCES)
-
-# Make versioned links. We only run the transform on the root name;
-# then we make a versioned link with the transformed base name. This
-# seemed like the most reasonable approach.
-install-exec-hook:
- @$(POST_INSTALL)
- @for p in $(bin_SCRIPTS); do \
- f=`echo $$p | sed -e 's,.*/,,' -e '$(transform)'`; \
- fv="$$f-$(APIVERSION)"; \
- rm -f "$(DESTDIR)$(bindir)/$$fv"; \
- echo " $(LN) '$(DESTDIR)$(bindir)/$$f' '$(DESTDIR)$(bindir)/$$fv'"; \
- $(LN) "$(DESTDIR)$(bindir)/$$f" "$(DESTDIR)$(bindir)/$$fv"; \
- done
-
-uninstall-hook:
- @for p in $(bin_SCRIPTS); do \
- f=`echo $$p | sed -e 's,.*/,,' -e '$(transform)'`; \
- fv="$$f-$(APIVERSION)"; \
- rm -f "$(DESTDIR)$(bindir)/$$fv"; \
- done
-
-# These files depend on Makefile so they are rebuilt if $(VERSION),
-# $(datadir) or other do_subst'ituted variables change.
-%D%/automake: %D%/automake.in
-%D%/aclocal: %D%/aclocal.in
-%D%/automake %D%/aclocal: Makefile
- $(AM_V_GEN)rm -f $@ $@-t $@-t2 \
- && $(MKDIR_P) $(@D) \
-## Common substitutions.
- && in=$@.in && $(do_subst) <$(srcdir)/$$in >$@-t \
-## We can't use '$(generated_file_finalize)' here, because currently
-## Automake contains occurrences of unexpanded @substitutions@ in
-## comments, and that is perfectly legit.
- && chmod a+x,a-w $@-t && mv -f $@-t $@
-
-%D%/aclocal-$(APIVERSION): %D%/aclocal
- $(AM_V_GEN) rm -f $@; \
- $(LN) %D%/aclocal $@
-
-%D%/automake-$(APIVERSION): %D%/automake
- $(AM_V_GEN) rm -f $@; \
- $(LN) %D%/automake $@
-
-# vim: ft=automake noet
diff --git a/bin/local.mk b/bin/local.mk
new file mode 100644
index 000000000..c63f670b8
--- /dev/null
+++ b/bin/local.mk
@@ -0,0 +1,82 @@
+## Copyright (C) 1995-2017 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
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see .
+
+## ----------------------------------- ##
+## The automake and aclocal scripts. ##
+## ----------------------------------- ##
+
+bin_SCRIPTS = %D%/automake %D%/aclocal
+nodist_noinst_SCRIPTS += \
+ %D%/aclocal-$(APIVERSION) \
+ %D%/automake-$(APIVERSION)
+
+CLEANFILES += \
+ $(bin_SCRIPTS) \
+ %D%/aclocal-$(APIVERSION) \
+ %D%/automake-$(APIVERSION)
+
+# Used by maintainer checks and such.
+automake_in = $(srcdir)/%D%/automake.in
+aclocal_in = $(srcdir)/%D%/aclocal.in
+automake_script = %D%/automake
+aclocal_script = %D%/aclocal
+
+AUTOMAKESOURCES = $(automake_in) $(aclocal_in)
+TAGS_FILES += $(AUTOMAKESOURCES)
+EXTRA_DIST += $(AUTOMAKESOURCES)
+
+# Make versioned links. We only run the transform on the root name;
+# then we make a versioned link with the transformed base name. This
+# seemed like the most reasonable approach.
+install-exec-hook:
+ @$(POST_INSTALL)
+ @for p in $(bin_SCRIPTS); do \
+ f=`echo $$p | sed -e 's,.*/,,' -e '$(transform)'`; \
+ fv="$$f-$(APIVERSION)"; \
+ rm -f "$(DESTDIR)$(bindir)/$$fv"; \
+ echo " $(LN) '$(DESTDIR)$(bindir)/$$f' '$(DESTDIR)$(bindir)/$$fv'"; \
+ $(LN) "$(DESTDIR)$(bindir)/$$f" "$(DESTDIR)$(bindir)/$$fv"; \
+ done
+
+uninstall-hook:
+ @for p in $(bin_SCRIPTS); do \
+ f=`echo $$p | sed -e 's,.*/,,' -e '$(transform)'`; \
+ fv="$$f-$(APIVERSION)"; \
+ rm -f "$(DESTDIR)$(bindir)/$$fv"; \
+ done
+
+# These files depend on Makefile so they are rebuilt if $(VERSION),
+# $(datadir) or other do_subst'ituted variables change.
+%D%/automake: %D%/automake.in
+%D%/aclocal: %D%/aclocal.in
+%D%/automake %D%/aclocal: Makefile
+ $(AM_V_GEN)rm -f $@ $@-t $@-t2 \
+ && $(MKDIR_P) $(@D) \
+## Common substitutions.
+ && in=$@.in && $(do_subst) <$(srcdir)/$$in >$@-t \
+## We can't use '$(generated_file_finalize)' here, because currently
+## Automake contains occurrences of unexpanded @substitutions@ in
+## comments, and that is perfectly legit.
+ && chmod a+x,a-w $@-t && mv -f $@-t $@
+
+%D%/aclocal-$(APIVERSION): %D%/aclocal
+ $(AM_V_GEN) rm -f $@; \
+ $(LN) %D%/aclocal $@
+
+%D%/automake-$(APIVERSION): %D%/automake
+ $(AM_V_GEN) rm -f $@; \
+ $(LN) %D%/automake $@
+
+# vim: ft=automake noet
diff --git a/contrib/t/Makefile.inc b/contrib/t/Makefile.inc
deleted file mode 100644
index d55fb9583..000000000
--- a/contrib/t/Makefile.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-## Included by top-level Makefile for Automake.
-
-## Copyright (C) 1995-2017 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
-
-## -------------------------------- ##
-## Tests for stuff in 'contrib/'. ##
-## -------------------------------- ##
-
-contrib_TESTS = \
- %D%/parallel-tests-html.sh \
- %D%/parallel-tests-html-recursive.sh \
- %D%/help-multilib.sh \
- %D%/multilib.sh
diff --git a/contrib/t/local.mk b/contrib/t/local.mk
new file mode 100644
index 000000000..d55fb9583
--- /dev/null
+++ b/contrib/t/local.mk
@@ -0,0 +1,26 @@
+## Included by top-level Makefile for Automake.
+
+## Copyright (C) 1995-2017 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
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see .
+
+## -------------------------------- ##
+## Tests for stuff in 'contrib/'. ##
+## -------------------------------- ##
+
+contrib_TESTS = \
+ %D%/parallel-tests-html.sh \
+ %D%/parallel-tests-html-recursive.sh \
+ %D%/help-multilib.sh \
+ %D%/multilib.sh
diff --git a/doc/Makefile.inc b/doc/Makefile.inc
deleted file mode 100644
index 807c29308..000000000
--- a/doc/Makefile.inc
+++ /dev/null
@@ -1,115 +0,0 @@
-## Included by top-level Makefile for Automake.
-
-## Copyright (C) 1995-2017 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
-
-## ---------------- ##
-## Documentation. ##
-## ---------------- ##
-
-info_TEXINFOS = %D%/automake.texi %D%/automake-history.texi
-doc_automake_TEXINFOS = %D%/fdl.texi
-doc_automake_history_TEXINFOS = %D%/fdl.texi
-
-man1_MANS = \
- %D%/aclocal.1 \
- %D%/automake.1 \
- %D%/aclocal-$(APIVERSION).1 \
- %D%/automake-$(APIVERSION).1
-
-$(man1_MANS): $(top_srcdir)/configure.ac
-
-CLEANFILES += $(man1_MANS)
-# XXX: This script should be updated with 'fetch' target.
-EXTRA_DIST += %D%/help2man
-
-update_mans = \
- $(AM_V_GEN): \
- && $(MKDIR_P) %D% \
- && ./pre-inst-env $(PERL) $(srcdir)/%D%/help2man --output=$@
-
-%D%/aclocal.1 %D%/automake.1:
- $(AM_V_GEN): \
- && $(MKDIR_P) %D% \
- && f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'` \
- && echo ".so man1/$$f-$(APIVERSION).1" > $@
-
-%D%/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm
- $(update_mans) aclocal-$(APIVERSION)
-%D%/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm
- $(update_mans) automake-$(APIVERSION)
-
-## ---------------------------- ##
-## Example package "amhello". ##
-## ---------------------------- ##
-
-amhello_sources = \
- %D%/amhello/configure.ac \
- %D%/amhello/Makefile.am \
- %D%/amhello/README \
- %D%/amhello/src/main.c \
- %D%/amhello/src/Makefile.am
-
-amhello_configury = \
- aclocal.m4 \
- autom4te.cache \
- Makefile.in \
- config.h.in \
- configure \
- depcomp \
- install-sh \
- missing \
- src/Makefile.in
-
-dist_noinst_DATA += $(amhello_sources)
-dist_doc_DATA = $(srcdir)/%D%/amhello-1.0.tar.gz
-
-setup_autotools_paths = { \
- ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \
- && AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE \
- && AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF \
- && AUTOM4TE='$(am_AUTOM4TE)' && export AUTOM4TE \
- && AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF \
- && AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER \
- && AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE \
- && true; \
-}
-
-# We depend on configure.ac so that we regenerate the tarball
-# whenever the Automake version changes.
-$(srcdir)/%D%/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac
- $(AM_V_GEN)tmp=amhello-output.tmp \
- && $(am__cd) $(srcdir)/%D%/amhello \
- && : Make our aclocal and automake avaiable before system ones. \
- && $(setup_autotools_paths) \
- && ( \
- { $(AM_V_P) || exec 5>&2 >$$tmp 2>&1; } \
- && $(abs_builddir)/pre-inst-env $(am_AUTORECONF) -vfi \
- && ./configure \
- && $(MAKE) $(AM_MAKEFLAGS) distcheck \
- && $(MAKE) $(AM_MAKEFLAGS) distclean \
- || { \
- if $(AM_V_P); then :; else \
- echo "$@: recipe failed." >&5; \
- echo "See file '`pwd`/$$tmp' for details" >&5; \
- fi; \
- exit 1; \
- } \
- ) \
- && rm -rf $(amhello_configury) $$tmp \
- && mv -f amhello-1.0.tar.gz ..
-
-
-# vim: ft=automake noet
diff --git a/doc/local.mk b/doc/local.mk
new file mode 100644
index 000000000..807c29308
--- /dev/null
+++ b/doc/local.mk
@@ -0,0 +1,115 @@
+## Included by top-level Makefile for Automake.
+
+## Copyright (C) 1995-2017 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
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see .
+
+## ---------------- ##
+## Documentation. ##
+## ---------------- ##
+
+info_TEXINFOS = %D%/automake.texi %D%/automake-history.texi
+doc_automake_TEXINFOS = %D%/fdl.texi
+doc_automake_history_TEXINFOS = %D%/fdl.texi
+
+man1_MANS = \
+ %D%/aclocal.1 \
+ %D%/automake.1 \
+ %D%/aclocal-$(APIVERSION).1 \
+ %D%/automake-$(APIVERSION).1
+
+$(man1_MANS): $(top_srcdir)/configure.ac
+
+CLEANFILES += $(man1_MANS)
+# XXX: This script should be updated with 'fetch' target.
+EXTRA_DIST += %D%/help2man
+
+update_mans = \
+ $(AM_V_GEN): \
+ && $(MKDIR_P) %D% \
+ && ./pre-inst-env $(PERL) $(srcdir)/%D%/help2man --output=$@
+
+%D%/aclocal.1 %D%/automake.1:
+ $(AM_V_GEN): \
+ && $(MKDIR_P) %D% \
+ && f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'` \
+ && echo ".so man1/$$f-$(APIVERSION).1" > $@
+
+%D%/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm
+ $(update_mans) aclocal-$(APIVERSION)
+%D%/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm
+ $(update_mans) automake-$(APIVERSION)
+
+## ---------------------------- ##
+## Example package "amhello". ##
+## ---------------------------- ##
+
+amhello_sources = \
+ %D%/amhello/configure.ac \
+ %D%/amhello/Makefile.am \
+ %D%/amhello/README \
+ %D%/amhello/src/main.c \
+ %D%/amhello/src/Makefile.am
+
+amhello_configury = \
+ aclocal.m4 \
+ autom4te.cache \
+ Makefile.in \
+ config.h.in \
+ configure \
+ depcomp \
+ install-sh \
+ missing \
+ src/Makefile.in
+
+dist_noinst_DATA += $(amhello_sources)
+dist_doc_DATA = $(srcdir)/%D%/amhello-1.0.tar.gz
+
+setup_autotools_paths = { \
+ ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \
+ && AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE \
+ && AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF \
+ && AUTOM4TE='$(am_AUTOM4TE)' && export AUTOM4TE \
+ && AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF \
+ && AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER \
+ && AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE \
+ && true; \
+}
+
+# We depend on configure.ac so that we regenerate the tarball
+# whenever the Automake version changes.
+$(srcdir)/%D%/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac
+ $(AM_V_GEN)tmp=amhello-output.tmp \
+ && $(am__cd) $(srcdir)/%D%/amhello \
+ && : Make our aclocal and automake avaiable before system ones. \
+ && $(setup_autotools_paths) \
+ && ( \
+ { $(AM_V_P) || exec 5>&2 >$$tmp 2>&1; } \
+ && $(abs_builddir)/pre-inst-env $(am_AUTORECONF) -vfi \
+ && ./configure \
+ && $(MAKE) $(AM_MAKEFLAGS) distcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) distclean \
+ || { \
+ if $(AM_V_P); then :; else \
+ echo "$@: recipe failed." >&5; \
+ echo "See file '`pwd`/$$tmp' for details" >&5; \
+ fi; \
+ exit 1; \
+ } \
+ ) \
+ && rm -rf $(amhello_configury) $$tmp \
+ && mv -f amhello-1.0.tar.gz ..
+
+
+# vim: ft=automake noet
diff --git a/lib/Automake/Makefile.inc b/lib/Automake/Makefile.inc
deleted file mode 100644
index c0d8a4729..000000000
--- a/lib/Automake/Makefile.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-## Included by top-level Makefile for Automake.
-
-## Copyright (C) 1995-2017 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
-
-## ---------------------------------------------------- ##
-## Private perl modules used by automake and aclocal. ##
-## ---------------------------------------------------- ##
-
-perllibdir = $(pkgvdatadir)/Automake
-
-dist_perllib_DATA = \
- %D%/ChannelDefs.pm \
- %D%/Channels.pm \
- %D%/Condition.pm \
- %D%/Configure_ac.pm \
- %D%/DisjConditions.pm \
- %D%/FileUtils.pm \
- %D%/General.pm \
- %D%/Getopt.pm \
- %D%/Item.pm \
- %D%/ItemDef.pm \
- %D%/Language.pm \
- %D%/Location.pm \
- %D%/Options.pm \
- %D%/Rule.pm \
- %D%/RuleDef.pm \
- %D%/Variable.pm \
- %D%/VarDef.pm \
- %D%/Version.pm \
- %D%/XFile.pm \
- %D%/Wrap.pm
-
-nodist_perllib_DATA = %D%/Config.pm
-CLEANFILES += $(nodist_perllib_DATA)
-
-%D%/Config.pm: %D%/Config.in Makefile
- $(AM_V_at)rm -f $@ $@-t
- $(AM_V_at)$(MKDIR_P) %D%
- $(AM_V_GEN)in=Config.in \
- && $(do_subst) <$(srcdir)/%D%/Config.in >$@-t
- $(generated_file_finalize)
-EXTRA_DIST += %D%/Config.in
-
-# vim: ft=automake noet
diff --git a/lib/Automake/local.mk b/lib/Automake/local.mk
new file mode 100644
index 000000000..c0d8a4729
--- /dev/null
+++ b/lib/Automake/local.mk
@@ -0,0 +1,57 @@
+## Included by top-level Makefile for Automake.
+
+## Copyright (C) 1995-2017 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
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see .
+
+## ---------------------------------------------------- ##
+## Private perl modules used by automake and aclocal. ##
+## ---------------------------------------------------- ##
+
+perllibdir = $(pkgvdatadir)/Automake
+
+dist_perllib_DATA = \
+ %D%/ChannelDefs.pm \
+ %D%/Channels.pm \
+ %D%/Condition.pm \
+ %D%/Configure_ac.pm \
+ %D%/DisjConditions.pm \
+ %D%/FileUtils.pm \
+ %D%/General.pm \
+ %D%/Getopt.pm \
+ %D%/Item.pm \
+ %D%/ItemDef.pm \
+ %D%/Language.pm \
+ %D%/Location.pm \
+ %D%/Options.pm \
+ %D%/Rule.pm \
+ %D%/RuleDef.pm \
+ %D%/Variable.pm \
+ %D%/VarDef.pm \
+ %D%/Version.pm \
+ %D%/XFile.pm \
+ %D%/Wrap.pm
+
+nodist_perllib_DATA = %D%/Config.pm
+CLEANFILES += $(nodist_perllib_DATA)
+
+%D%/Config.pm: %D%/Config.in Makefile
+ $(AM_V_at)rm -f $@ $@-t
+ $(AM_V_at)$(MKDIR_P) %D%
+ $(AM_V_GEN)in=Config.in \
+ && $(do_subst) <$(srcdir)/%D%/Config.in >$@-t
+ $(generated_file_finalize)
+EXTRA_DIST += %D%/Config.in
+
+# vim: ft=automake noet
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
deleted file mode 100644
index 50035de60..000000000
--- a/lib/Makefile.inc
+++ /dev/null
@@ -1,67 +0,0 @@
-## Included by top-level Makefile for Automake.
-
-## Copyright (C) 1995-2017 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
-
-## -------------------------------------------------------------------- ##
-## Auxiliary scripts and files for use with "automake --add-missing". ##
-## -------------------------------------------------------------------- ##
-
-dist_pkgvdata_DATA = \
- %D%/COPYING \
- %D%/INSTALL \
- %D%/texinfo.tex
-
-# These must all be executable when installed. However, if we use
-# _SCRIPTS, then the program transform will be applied, which is not
-# what we want. So we make them executable by hand.
-dist_script_DATA = \
- %D%/config.guess \
- %D%/config.sub \
- %D%/install-sh \
- %D%/mdate-sh \
- %D%/missing \
- %D%/mkinstalldirs \
- %D%/ylwrap \
- %D%/depcomp \
- %D%/compile \
- %D%/py-compile \
- %D%/ar-lib \
- %D%/test-driver \
- %D%/tap-driver.sh
-
-install-data-hook:
- @$(POST_INSTALL)
- @for f in $(dist_script_DATA); do echo $$f; done \
- | sed 's,^%D%/,,' \
- | ( st=0; \
- while read f; do \
- echo " chmod +x '$(DESTDIR)$(scriptdir)/$$f'"; \
- chmod +x "$(DESTDIR)$(scriptdir)/$$f" || st=1; \
- done; \
- exit $$st )
-
-installcheck-local: installcheck-executable-scripts
-installcheck-executable-scripts:
- @for f in $(dist_script_DATA); do echo $$f; done \
- | sed 's,^%D%/,,' \
- | while read f; do \
- path="$(pkgvdatadir)/$$f"; \
- test -x "$$path" || echo $$path; \
- done \
- | sed 's/$$/: not executable/' \
- | grep . 1>&2 && exit 1; exit 0
-
-# vim: ft=automake noet
diff --git a/lib/am/Makefile.inc b/lib/am/Makefile.inc
deleted file mode 100644
index 270bb7347..000000000
--- a/lib/am/Makefile.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-## Included by top-level Makefile for Automake.
-
-## Copyright (C) 1995-2017 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
-
-## --------------------- ##
-## Makefile fragments. ##
-## --------------------- ##
-
-amdir = @amdir@
-
-dist_am_DATA = \
- %D%/check.am \
- %D%/check2.am \
- %D%/clean-hdr.am \
- %D%/clean.am \
- %D%/compile.am \
- %D%/configure.am \
- %D%/data.am \
- %D%/dejagnu.am \
- %D%/depend.am \
- %D%/depend2.am \
- %D%/distdir.am \
- %D%/footer.am \
- %D%/header-vars.am \
- %D%/header.am \
- %D%/install.am \
- %D%/inst-vars.am \
- %D%/java.am \
- %D%/lang-compile.am \
- %D%/lex.am \
- %D%/library.am \
- %D%/libs.am \
- %D%/libtool.am \
- %D%/lisp.am \
- %D%/ltlib.am \
- %D%/ltlibrary.am \
- %D%/mans-vars.am \
- %D%/mans.am \
- %D%/program.am \
- %D%/progs.am \
- %D%/python.am \
- %D%/remake-hdr.am \
- %D%/scripts.am \
- %D%/subdirs.am \
- %D%/tags.am \
- %D%/texi-vers.am \
- %D%/texibuild.am \
- %D%/texinfos.am \
- %D%/vala.am \
- %D%/yacc.am
-
-# vim: ft=automake noet
diff --git a/lib/am/local.mk b/lib/am/local.mk
new file mode 100644
index 000000000..270bb7347
--- /dev/null
+++ b/lib/am/local.mk
@@ -0,0 +1,65 @@
+## Included by top-level Makefile for Automake.
+
+## Copyright (C) 1995-2017 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
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see .
+
+## --------------------- ##
+## Makefile fragments. ##
+## --------------------- ##
+
+amdir = @amdir@
+
+dist_am_DATA = \
+ %D%/check.am \
+ %D%/check2.am \
+ %D%/clean-hdr.am \
+ %D%/clean.am \
+ %D%/compile.am \
+ %D%/configure.am \
+ %D%/data.am \
+ %D%/dejagnu.am \
+ %D%/depend.am \
+ %D%/depend2.am \
+ %D%/distdir.am \
+ %D%/footer.am \
+ %D%/header-vars.am \
+ %D%/header.am \
+ %D%/install.am \
+ %D%/inst-vars.am \
+ %D%/java.am \
+ %D%/lang-compile.am \
+ %D%/lex.am \
+ %D%/library.am \
+ %D%/libs.am \
+ %D%/libtool.am \
+ %D%/lisp.am \
+ %D%/ltlib.am \
+ %D%/ltlibrary.am \
+ %D%/mans-vars.am \
+ %D%/mans.am \
+ %D%/program.am \
+ %D%/progs.am \
+ %D%/python.am \
+ %D%/remake-hdr.am \
+ %D%/scripts.am \
+ %D%/subdirs.am \
+ %D%/tags.am \
+ %D%/texi-vers.am \
+ %D%/texibuild.am \
+ %D%/texinfos.am \
+ %D%/vala.am \
+ %D%/yacc.am
+
+# vim: ft=automake noet
diff --git a/lib/local.mk b/lib/local.mk
new file mode 100644
index 000000000..50035de60
--- /dev/null
+++ b/lib/local.mk
@@ -0,0 +1,67 @@
+## Included by top-level Makefile for Automake.
+
+## Copyright (C) 1995-2017 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
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see .
+
+## -------------------------------------------------------------------- ##
+## Auxiliary scripts and files for use with "automake --add-missing". ##
+## -------------------------------------------------------------------- ##
+
+dist_pkgvdata_DATA = \
+ %D%/COPYING \
+ %D%/INSTALL \
+ %D%/texinfo.tex
+
+# These must all be executable when installed. However, if we use
+# _SCRIPTS, then the program transform will be applied, which is not
+# what we want. So we make them executable by hand.
+dist_script_DATA = \
+ %D%/config.guess \
+ %D%/config.sub \
+ %D%/install-sh \
+ %D%/mdate-sh \
+ %D%/missing \
+ %D%/mkinstalldirs \
+ %D%/ylwrap \
+ %D%/depcomp \
+ %D%/compile \
+ %D%/py-compile \
+ %D%/ar-lib \
+ %D%/test-driver \
+ %D%/tap-driver.sh
+
+install-data-hook:
+ @$(POST_INSTALL)
+ @for f in $(dist_script_DATA); do echo $$f; done \
+ | sed 's,^%D%/,,' \
+ | ( st=0; \
+ while read f; do \
+ echo " chmod +x '$(DESTDIR)$(scriptdir)/$$f'"; \
+ chmod +x "$(DESTDIR)$(scriptdir)/$$f" || st=1; \
+ done; \
+ exit $$st )
+
+installcheck-local: installcheck-executable-scripts
+installcheck-executable-scripts:
+ @for f in $(dist_script_DATA); do echo $$f; done \
+ | sed 's,^%D%/,,' \
+ | while read f; do \
+ path="$(pkgvdatadir)/$$f"; \
+ test -x "$$path" || echo $$path; \
+ done \
+ | sed 's/$$/: not executable/' \
+ | grep . 1>&2 && exit 1; exit 0
+
+# vim: ft=automake noet
diff --git a/m4/Makefile.inc b/m4/Makefile.inc
deleted file mode 100644
index eb5702742..000000000
--- a/m4/Makefile.inc
+++ /dev/null
@@ -1,79 +0,0 @@
-## Included by top-level Makefile for Automake.
-
-## Copyright (C) 1995-2017 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
-
-## ------------------------------ ##
-## Automake-provided m4 macros. ##
-## ------------------------------ ##
-
-system_acdir = @system_acdir@
-automake_acdir = @automake_acdir@
-
-dist_automake_ac_DATA = \
- %D%/amversion.m4 \
- %D%/ar-lib.m4 \
- %D%/as.m4 \
- %D%/auxdir.m4 \
- %D%/cond.m4 \
- %D%/cond-if.m4 \
- %D%/depend.m4 \
- %D%/depout.m4 \
- %D%/dmalloc.m4 \
- %D%/extra-recurs.m4 \
- %D%/gcj.m4 \
- %D%/init.m4 \
- %D%/install-sh.m4 \
- %D%/lead-dot.m4 \
- %D%/lex.m4 \
- %D%/lispdir.m4 \
- %D%/maintainer.m4 \
- %D%/make.m4 \
- %D%/missing.m4 \
- %D%/mkdirp.m4 \
- %D%/obsolete.m4 \
- %D%/options.m4 \
- %D%/python.m4 \
- %D%/prog-cc-c-o.m4 \
- %D%/runlog.m4 \
- %D%/sanity.m4 \
- %D%/silent.m4 \
- %D%/strip.m4 \
- %D%/substnot.m4 \
- %D%/tar.m4 \
- %D%/upc.m4 \
- %D%/vala.m4
-
-dist_system_ac_DATA = %D%/acdir/README
-
-automake_internal_acdir = $(automake_acdir)/internal
-dist_automake_internal_ac_DATA = %D%/internal/ac-config-macro-dirs.m4
-
-# We build amversion.m4 here, instead of from config.status,
-# because config.status is rerun each time one of configure's
-# dependencies change and amversion.m4 happens to be a configure
-# dependency. configure and amversion.m4 would be rebuilt in
-# loop otherwise.
-# Use '$(top_srcdir)' for the benefit of non-GNU makes: this is
-# how amversion.m4 appears in our dependencies.
-$(top_srcdir)/%D%/amversion.m4: $(srcdir)/configure.ac \
- $(srcdir)/%D%/amversion.in
- $(AM_V_at)rm -f $@-t $@
- $(AM_V_GEN)in=amversion.in \
- && $(do_subst) <$(srcdir)/%D%/amversion.in >$@-t
- $(generated_file_finalize)
-EXTRA_DIST += %D%/amversion.in
-
-# vim: ft=automake noet
diff --git a/m4/local.mk b/m4/local.mk
new file mode 100644
index 000000000..eb5702742
--- /dev/null
+++ b/m4/local.mk
@@ -0,0 +1,79 @@
+## Included by top-level Makefile for Automake.
+
+## Copyright (C) 1995-2017 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
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see .
+
+## ------------------------------ ##
+## Automake-provided m4 macros. ##
+## ------------------------------ ##
+
+system_acdir = @system_acdir@
+automake_acdir = @automake_acdir@
+
+dist_automake_ac_DATA = \
+ %D%/amversion.m4 \
+ %D%/ar-lib.m4 \
+ %D%/as.m4 \
+ %D%/auxdir.m4 \
+ %D%/cond.m4 \
+ %D%/cond-if.m4 \
+ %D%/depend.m4 \
+ %D%/depout.m4 \
+ %D%/dmalloc.m4 \
+ %D%/extra-recurs.m4 \
+ %D%/gcj.m4 \
+ %D%/init.m4 \
+ %D%/install-sh.m4 \
+ %D%/lead-dot.m4 \
+ %D%/lex.m4 \
+ %D%/lispdir.m4 \
+ %D%/maintainer.m4 \
+ %D%/make.m4 \
+ %D%/missing.m4 \
+ %D%/mkdirp.m4 \
+ %D%/obsolete.m4 \
+ %D%/options.m4 \
+ %D%/python.m4 \
+ %D%/prog-cc-c-o.m4 \
+ %D%/runlog.m4 \
+ %D%/sanity.m4 \
+ %D%/silent.m4 \
+ %D%/strip.m4 \
+ %D%/substnot.m4 \
+ %D%/tar.m4 \
+ %D%/upc.m4 \
+ %D%/vala.m4
+
+dist_system_ac_DATA = %D%/acdir/README
+
+automake_internal_acdir = $(automake_acdir)/internal
+dist_automake_internal_ac_DATA = %D%/internal/ac-config-macro-dirs.m4
+
+# We build amversion.m4 here, instead of from config.status,
+# because config.status is rerun each time one of configure's
+# dependencies change and amversion.m4 happens to be a configure
+# dependency. configure and amversion.m4 would be rebuilt in
+# loop otherwise.
+# Use '$(top_srcdir)' for the benefit of non-GNU makes: this is
+# how amversion.m4 appears in our dependencies.
+$(top_srcdir)/%D%/amversion.m4: $(srcdir)/configure.ac \
+ $(srcdir)/%D%/amversion.in
+ $(AM_V_at)rm -f $@-t $@
+ $(AM_V_GEN)in=amversion.in \
+ && $(do_subst) <$(srcdir)/%D%/amversion.in >$@-t
+ $(generated_file_finalize)
+EXTRA_DIST += %D%/amversion.in
+
+# vim: ft=automake noet
diff --git a/t/Makefile.inc b/t/Makefile.inc
deleted file mode 100644
index 6b3b62fed..000000000
--- a/t/Makefile.inc
+++ /dev/null
@@ -1,268 +0,0 @@
-## Included by top-level Makefile for Automake.
-
-## Copyright (C) 1995-2017 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
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
-
-## ------------ ##
-## Testsuite. ##
-## ------------ ##
-
-# Run the tests with a proper shell detected at configure time.
-LOG_COMPILER = ./pre-inst-env $(AM_TEST_RUNNER_SHELL)
-
-TEST_EXTENSIONS = .pl .sh .tap
-SH_LOG_COMPILER = $(LOG_COMPILER)
-TAP_LOG_COMPILER = $(LOG_COMPILER)
-PL_LOG_COMPILER = ./pre-inst-env $(PERL)
-AM_PL_LOG_FLAGS = -Mstrict -w
-
-TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(srcdir)/lib/tap-driver.sh
-
-AM_TAP_LOG_DRIVER_FLAGS = --merge
-
-EXTRA_DIST += %D%/README %D%/ax/is %D%/ax/is_newest %D%/ax/deltree.pl
-
-
-## Will be updated later.
-TESTS =
-
-# Some testsuite-influential variables should be overridable from the
-# test scripts, but not from the environment.
-# Keep this in sync with the similar list in ax/runtest.in.
-AM_TESTS_ENVIRONMENT = \
- for v in \
- required \
- am_test_protocol \
- am_serial_tests \
- am_test_prefer_config_shell \
- am_original_AUTOMAKE \
- am_original_ACLOCAL \
- am_test_lib_sourced \
- test_lib_sourced \
- ; do \
- eval test x"\$${$$v}" = x || unset $$v; \
- done;
-# We want warning messages and explanations for skipped tests to go to
-# the console if possible, so set up 'stderr_fileno_' properly.
-AM_TESTS_FD_REDIRECT = 9>&2
-AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export stderr_fileno_;
-
-# For sourcing of extra "shell libraries" by our test scripts. As per
-# POSIX, sourcing a file with '.' will cause it to be looked up in $PATH
-# in case it is given with a relative name containing no slashes.
-AM_TESTS_ENVIRONMENT += \
- if test $(srcdir) != .; then \
- PATH='$(abs_srcdir)/%D%/ax$(PATH_SEPARATOR)'$$PATH; \
- fi; \
- PATH='$(abs_builddir)/%D%/ax$(PATH_SEPARATOR)'$$PATH; \
- export PATH;
-
-# Hand-written tests.
-
-include $(srcdir)/%D%/list-of-tests.mk
-
-TESTS += $(handwritten_TESTS)
-EXTRA_DIST += $(handwritten_TESTS)
-
-# Automatically-generated tests wrapping hand-written ones.
-# Also, automatically-computed dependencies for tests.
-
-include $(srcdir)/%D%/testsuite-part.am
-
-TESTS += $(generated_TESTS)
-EXTRA_DIST += $(generated_TESTS)
-
-$(srcdir)/%D%/testsuite-part.am:
- $(AM_V_at)rm -f %D%/testsuite-part.tmp $@
- $(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part \
- --srcdir $(srcdir) > %D%/testsuite-part.tmp
- $(AM_V_at)chmod a-w %D%/testsuite-part.tmp
- $(AM_V_at)mv -f %D%/testsuite-part.tmp $@
-EXTRA_DIST += gen-testsuite-part
-
-# The dependecies declared here are not truly complete, but such
-# completeness would cause more issues than it would solve. See
-# automake bug#11347.
-$(generated_TESTS): $(srcdir)/gen-testsuite-part
-$(srcdir)/%D%/testsuite-part.am: $(srcdir)/gen-testsuite-part
-$(srcdir)/%D%/testsuite-part.am: Makefile.am
-
-# Hand-written tests for stuff in 'contrib/'.
-include $(srcdir)/contrib/%D%/Makefile.inc
-TESTS += $(contrib_TESTS)
-EXTRA_DIST += $(contrib_TESTS)
-
-# Static dependencies valid for each test case (also further
-# extended later). Note that use 'noinst_' rather than 'check_'
-# as the prefix, because we really want them to be built by
-# "make all". This makes it easier to run the test cases by
-# hand after having simply configured and built the package.
-
-dist_noinst_DATA += \
- %D%/ax/test-init.sh \
- %D%/ax/test-lib.sh \
- %D%/ax/am-test-lib.sh \
- %D%/ax/tap-functions.sh
-
-# Few more static dependencies.
-%D%/distcheck-missing-m4.log: %D%/ax/distcheck-hook-m4.am
-%D%/distcheck-outdated-m4.log: %D%/ax/distcheck-hook-m4.am
-EXTRA_DIST += %D%/ax/distcheck-hook-m4.am
-
-%D%/ax/test-defs.sh: %D%/ax/test-defs.in Makefile
- $(AM_V_at)rm -f $@ $@-t
- $(AM_V_at)$(MKDIR_P) %D%/ax
- $(AM_V_GEN)in=%D%/ax/test-defs.in \
- && $(do_subst) <$(srcdir)/$$in >$@-t
- $(generated_file_finalize)
-EXTRA_DIST += %D%/ax/test-defs.in
-CLEANFILES += %D%/ax/test-defs.sh
-nodist_noinst_DATA += %D%/ax/test-defs.sh
-
-%D%/ax/shell-no-trail-bslash: %D%/ax/shell-no-trail-bslash.in Makefile
- $(AM_V_at)rm -f $@ $@-t
- $(AM_V_GEN)in=%D%/ax/shell-no-trail-bslash.in \
- && $(MKDIR_P) %D%/ax \
- && $(do_subst) <$(srcdir)/$$in >$@-t \
- && chmod a+x $@-t
- $(generated_file_finalize)
-EXTRA_DIST += %D%/ax/shell-no-trail-bslash.in
-CLEANFILES += %D%/ax/shell-no-trail-bslash
-nodist_noinst_SCRIPTS += %D%/ax/shell-no-trail-bslash
-
-%D%/ax/cc-no-c-o: %D%/ax/cc-no-c-o.in Makefile
- $(AM_V_at)rm -f $@ $@-t
- $(AM_V_GEN)in=%D%/ax/cc-no-c-o.in \
- && $(MKDIR_P) %D%/ax \
- && $(do_subst) <$(srcdir)/$$in >$@-t \
- && chmod a+x $@-t
- $(generated_file_finalize)
-EXTRA_DIST += %D%/ax/cc-no-c-o.in
-CLEANFILES += %D%/ax/cc-no-c-o
-nodist_noinst_SCRIPTS += %D%/ax/cc-no-c-o
-
-runtest: %D%/ax/runtest.in Makefile
- $(AM_V_at)rm -f $@ $@-t
- $(AM_V_GEN)in=%D%/ax/runtest.in \
- && $(MKDIR_P) %D%/ax \
- && $(do_subst) <$(srcdir)/$$in >$@-t \
- && chmod a+x $@-t
- $(generated_file_finalize)
-EXTRA_DIST += %D%/ax/runtest.in
-CLEANFILES += runtest
-nodist_noinst_SCRIPTS += runtest
-
-# If two test scripts have the same basename, they will end up sharing
-# the same log file, leading to all sort of undefined and undesired
-# behaviours.
-check-no-repeated-test-name:
- @LC_ALL=C; export LC_ALL; \
- lst='$(TEST_LOGS)'; for log in $$lst; do echo $$log; done \
- | sort | uniq -c | awk '($$1 > 1) { print }' \
- | sed 's/\.log$$//' | grep . >&2 \
- && { \
- echo $@: test names listed above are duplicated >&2; \
- exit 1; \
- }; :
-check-local: check-no-repeated-test-name
-.PHONY: check-no-repeated-test-name
-
-# Check that our test cases are syntactically correct.
-# See automake bug#11898.
-check-tests-syntax:
- @st=0; \
- err () { echo "$@: $$*" >&2; st=1; }; \
-## The user might do something like "make check TESTS=t/foo" or
-## "make check TESTS_LOGS=t/foo.log" and expect (say) the test
-## 't/foo.sh' to be run; this has worked well until today, and
-## we want to continue supporting this use case.
- bases=`for log in : $(TEST_LOGS); do echo $$log; done \
- | sed -e '/^:$$/d' -e 's/\.log$$//'`; \
- for bas in $$bases; do \
- for suf in sh tap pl; do \
- tst=$$bas.$$suf; \
-## Emulate VPATH search.
- if test -f $$tst; then \
- break; \
- elif test -f $(srcdir)/$$tst; then \
- tst=$(srcdir)/$$tst; \
- break; \
- else \
- tst=''; \
- fi; \
- done; \
- test -n "$$tst" || err "couldn't find test '$$bas'"; \
-## Don't check that perl tests are valid shell scripts!
- test $$suf = pl && continue; \
- $(AM_V_P) && echo " $(AM_TEST_RUNNER_SHELL) -n $$tst"; \
- $(AM_TEST_RUNNER_SHELL) -n "$$tst" \
- || err "test '$$tst' syntactically invalid"; \
- done; \
- exit $$st
-check-local: check-tests-syntax
-.PHONY: check-tests-syntax
-
-# Recipes with a trailing backslash character (possibly followed by
-# blank characters only) can cause spurious syntax errors with at
-# least older bash versions (e.g., bash 2.05b), and can be potentially
-# be unportable to other weaker shells. Run the testsuite in a way
-# that helps catching such problems in Automake-generated recipes.
-# See automake bug#10436.
-check-no-trailing-backslash-in-recipes:
- $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
- CONFIG_SHELL='$(abs_top_builddir)/%D%/ax/shell-no-trail-bslash'
-.PHONY: check-no-trailing-backslash-in-recipes
-
-# Some compilers out there (hello, MSVC) still choke on "-c -o" being
-# passed together on the command line. Run the whole testsuite faking
-# the presence of such a compiler, to help catch regressions that would
-# otherwise only present themselves later "in the wild". See also the
-# long discussion about automake bug#13378.
-check-cc-no-c-o:
- $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
- AM_TESTSUITE_SIMULATING_NO_CC_C_O=yes
-.PHONY: check-cc-no-c-o
-
-# Automake-generated Makefiles should work when run with parallel make.
-check-parallel:
- $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
- AM_TESTSUITE_MAKE="$${AM_TESTSUITE_MAKE-$${MAKE-make}} -j4"
-.PHONY: check-parallel
-
-## Checking the list of tests.
-test_subdirs = %D% %D%/pm contrib/%D%
-include %D%/CheckListOfTests.am
-
-# Run the testsuite with the installed aclocal and automake.
-installcheck-local: installcheck-testsuite
-installcheck-testsuite:
- $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
- am_running_installcheck=yes
-
-# Performance tests.
-.PHONY: perf
-perf: all
- $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
- TEST_SUITE_LOG='$(PERF_TEST_SUITE_LOG)' TESTS='$(perf_TESTS)'
-PERF_TEST_SUITE_LOG = %D%/perf/test-suite.log
-CLEANFILES += $(PERF_TEST_SUITE_LOG)
-EXTRA_DIST += $(perf_TESTS)
-
-clean-local: clean-local-check
-.PHONY: clean-local-check
-clean-local-check:
- $(AM_V_GEN)$(PERL) $(srcdir)/t/ax/deltree.pl t/*.dir t/*/*.dir */t/*.dir
-
-# vim: ft=automake noet
diff --git a/t/local.mk b/t/local.mk
new file mode 100644
index 000000000..d5fd00cb1
--- /dev/null
+++ b/t/local.mk
@@ -0,0 +1,268 @@
+## Included by top-level Makefile for Automake.
+
+## Copyright (C) 1995-2017 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
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see .
+
+## ------------ ##
+## Testsuite. ##
+## ------------ ##
+
+# Run the tests with a proper shell detected at configure time.
+LOG_COMPILER = ./pre-inst-env $(AM_TEST_RUNNER_SHELL)
+
+TEST_EXTENSIONS = .pl .sh .tap
+SH_LOG_COMPILER = $(LOG_COMPILER)
+TAP_LOG_COMPILER = $(LOG_COMPILER)
+PL_LOG_COMPILER = ./pre-inst-env $(PERL)
+AM_PL_LOG_FLAGS = -Mstrict -w
+
+TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(srcdir)/lib/tap-driver.sh
+
+AM_TAP_LOG_DRIVER_FLAGS = --merge
+
+EXTRA_DIST += %D%/README %D%/ax/is %D%/ax/is_newest %D%/ax/deltree.pl
+
+
+## Will be updated later.
+TESTS =
+
+# Some testsuite-influential variables should be overridable from the
+# test scripts, but not from the environment.
+# Keep this in sync with the similar list in ax/runtest.in.
+AM_TESTS_ENVIRONMENT = \
+ for v in \
+ required \
+ am_test_protocol \
+ am_serial_tests \
+ am_test_prefer_config_shell \
+ am_original_AUTOMAKE \
+ am_original_ACLOCAL \
+ am_test_lib_sourced \
+ test_lib_sourced \
+ ; do \
+ eval test x"\$${$$v}" = x || unset $$v; \
+ done;
+# We want warning messages and explanations for skipped tests to go to
+# the console if possible, so set up 'stderr_fileno_' properly.
+AM_TESTS_FD_REDIRECT = 9>&2
+AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export stderr_fileno_;
+
+# For sourcing of extra "shell libraries" by our test scripts. As per
+# POSIX, sourcing a file with '.' will cause it to be looked up in $PATH
+# in case it is given with a relative name containing no slashes.
+AM_TESTS_ENVIRONMENT += \
+ if test $(srcdir) != .; then \
+ PATH='$(abs_srcdir)/%D%/ax$(PATH_SEPARATOR)'$$PATH; \
+ fi; \
+ PATH='$(abs_builddir)/%D%/ax$(PATH_SEPARATOR)'$$PATH; \
+ export PATH;
+
+# Hand-written tests.
+
+include $(srcdir)/%D%/list-of-tests.mk
+
+TESTS += $(handwritten_TESTS)
+EXTRA_DIST += $(handwritten_TESTS)
+
+# Automatically-generated tests wrapping hand-written ones.
+# Also, automatically-computed dependencies for tests.
+
+include $(srcdir)/%D%/testsuite-part.am
+
+TESTS += $(generated_TESTS)
+EXTRA_DIST += $(generated_TESTS)
+
+$(srcdir)/%D%/testsuite-part.am:
+ $(AM_V_at)rm -f %D%/testsuite-part.tmp $@
+ $(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part \
+ --srcdir $(srcdir) > %D%/testsuite-part.tmp
+ $(AM_V_at)chmod a-w %D%/testsuite-part.tmp
+ $(AM_V_at)mv -f %D%/testsuite-part.tmp $@
+EXTRA_DIST += gen-testsuite-part
+
+# The dependecies declared here are not truly complete, but such
+# completeness would cause more issues than it would solve. See
+# automake bug#11347.
+$(generated_TESTS): $(srcdir)/gen-testsuite-part
+$(srcdir)/%D%/testsuite-part.am: $(srcdir)/gen-testsuite-part
+$(srcdir)/%D%/testsuite-part.am: Makefile.am
+
+# Hand-written tests for stuff in 'contrib/'.
+include $(srcdir)/contrib/%D%/local.mk
+TESTS += $(contrib_TESTS)
+EXTRA_DIST += $(contrib_TESTS)
+
+# Static dependencies valid for each test case (also further
+# extended later). Note that use 'noinst_' rather than 'check_'
+# as the prefix, because we really want them to be built by
+# "make all". This makes it easier to run the test cases by
+# hand after having simply configured and built the package.
+
+dist_noinst_DATA += \
+ %D%/ax/test-init.sh \
+ %D%/ax/test-lib.sh \
+ %D%/ax/am-test-lib.sh \
+ %D%/ax/tap-functions.sh
+
+# Few more static dependencies.
+%D%/distcheck-missing-m4.log: %D%/ax/distcheck-hook-m4.am
+%D%/distcheck-outdated-m4.log: %D%/ax/distcheck-hook-m4.am
+EXTRA_DIST += %D%/ax/distcheck-hook-m4.am
+
+%D%/ax/test-defs.sh: %D%/ax/test-defs.in Makefile
+ $(AM_V_at)rm -f $@ $@-t
+ $(AM_V_at)$(MKDIR_P) %D%/ax
+ $(AM_V_GEN)in=%D%/ax/test-defs.in \
+ && $(do_subst) <$(srcdir)/$$in >$@-t
+ $(generated_file_finalize)
+EXTRA_DIST += %D%/ax/test-defs.in
+CLEANFILES += %D%/ax/test-defs.sh
+nodist_noinst_DATA += %D%/ax/test-defs.sh
+
+%D%/ax/shell-no-trail-bslash: %D%/ax/shell-no-trail-bslash.in Makefile
+ $(AM_V_at)rm -f $@ $@-t
+ $(AM_V_GEN)in=%D%/ax/shell-no-trail-bslash.in \
+ && $(MKDIR_P) %D%/ax \
+ && $(do_subst) <$(srcdir)/$$in >$@-t \
+ && chmod a+x $@-t
+ $(generated_file_finalize)
+EXTRA_DIST += %D%/ax/shell-no-trail-bslash.in
+CLEANFILES += %D%/ax/shell-no-trail-bslash
+nodist_noinst_SCRIPTS += %D%/ax/shell-no-trail-bslash
+
+%D%/ax/cc-no-c-o: %D%/ax/cc-no-c-o.in Makefile
+ $(AM_V_at)rm -f $@ $@-t
+ $(AM_V_GEN)in=%D%/ax/cc-no-c-o.in \
+ && $(MKDIR_P) %D%/ax \
+ && $(do_subst) <$(srcdir)/$$in >$@-t \
+ && chmod a+x $@-t
+ $(generated_file_finalize)
+EXTRA_DIST += %D%/ax/cc-no-c-o.in
+CLEANFILES += %D%/ax/cc-no-c-o
+nodist_noinst_SCRIPTS += %D%/ax/cc-no-c-o
+
+runtest: %D%/ax/runtest.in Makefile
+ $(AM_V_at)rm -f $@ $@-t
+ $(AM_V_GEN)in=%D%/ax/runtest.in \
+ && $(MKDIR_P) %D%/ax \
+ && $(do_subst) <$(srcdir)/$$in >$@-t \
+ && chmod a+x $@-t
+ $(generated_file_finalize)
+EXTRA_DIST += %D%/ax/runtest.in
+CLEANFILES += runtest
+nodist_noinst_SCRIPTS += runtest
+
+# If two test scripts have the same basename, they will end up sharing
+# the same log file, leading to all sort of undefined and undesired
+# behaviours.
+check-no-repeated-test-name:
+ @LC_ALL=C; export LC_ALL; \
+ lst='$(TEST_LOGS)'; for log in $$lst; do echo $$log; done \
+ | sort | uniq -c | awk '($$1 > 1) { print }' \
+ | sed 's/\.log$$//' | grep . >&2 \
+ && { \
+ echo $@: test names listed above are duplicated >&2; \
+ exit 1; \
+ }; :
+check-local: check-no-repeated-test-name
+.PHONY: check-no-repeated-test-name
+
+# Check that our test cases are syntactically correct.
+# See automake bug#11898.
+check-tests-syntax:
+ @st=0; \
+ err () { echo "$@: $$*" >&2; st=1; }; \
+## The user might do something like "make check TESTS=t/foo" or
+## "make check TESTS_LOGS=t/foo.log" and expect (say) the test
+## 't/foo.sh' to be run; this has worked well until today, and
+## we want to continue supporting this use case.
+ bases=`for log in : $(TEST_LOGS); do echo $$log; done \
+ | sed -e '/^:$$/d' -e 's/\.log$$//'`; \
+ for bas in $$bases; do \
+ for suf in sh tap pl; do \
+ tst=$$bas.$$suf; \
+## Emulate VPATH search.
+ if test -f $$tst; then \
+ break; \
+ elif test -f $(srcdir)/$$tst; then \
+ tst=$(srcdir)/$$tst; \
+ break; \
+ else \
+ tst=''; \
+ fi; \
+ done; \
+ test -n "$$tst" || err "couldn't find test '$$bas'"; \
+## Don't check that perl tests are valid shell scripts!
+ test $$suf = pl && continue; \
+ $(AM_V_P) && echo " $(AM_TEST_RUNNER_SHELL) -n $$tst"; \
+ $(AM_TEST_RUNNER_SHELL) -n "$$tst" \
+ || err "test '$$tst' syntactically invalid"; \
+ done; \
+ exit $$st
+check-local: check-tests-syntax
+.PHONY: check-tests-syntax
+
+# Recipes with a trailing backslash character (possibly followed by
+# blank characters only) can cause spurious syntax errors with at
+# least older bash versions (e.g., bash 2.05b), and can be potentially
+# be unportable to other weaker shells. Run the testsuite in a way
+# that helps catching such problems in Automake-generated recipes.
+# See automake bug#10436.
+check-no-trailing-backslash-in-recipes:
+ $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
+ CONFIG_SHELL='$(abs_top_builddir)/%D%/ax/shell-no-trail-bslash'
+.PHONY: check-no-trailing-backslash-in-recipes
+
+# Some compilers out there (hello, MSVC) still choke on "-c -o" being
+# passed together on the command line. Run the whole testsuite faking
+# the presence of such a compiler, to help catch regressions that would
+# otherwise only present themselves later "in the wild". See also the
+# long discussion about automake bug#13378.
+check-cc-no-c-o:
+ $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
+ AM_TESTSUITE_SIMULATING_NO_CC_C_O=yes
+.PHONY: check-cc-no-c-o
+
+# Automake-generated Makefiles should work when run with parallel make.
+check-parallel:
+ $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
+ AM_TESTSUITE_MAKE="$${AM_TESTSUITE_MAKE-$${MAKE-make}} -j4"
+.PHONY: check-parallel
+
+## Checking the list of tests.
+test_subdirs = %D% %D%/pm contrib/%D%
+include %D%/CheckListOfTests.am
+
+# Run the testsuite with the installed aclocal and automake.
+installcheck-local: installcheck-testsuite
+installcheck-testsuite:
+ $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
+ am_running_installcheck=yes
+
+# Performance tests.
+.PHONY: perf
+perf: all
+ $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
+ TEST_SUITE_LOG='$(PERF_TEST_SUITE_LOG)' TESTS='$(perf_TESTS)'
+PERF_TEST_SUITE_LOG = %D%/perf/test-suite.log
+CLEANFILES += $(PERF_TEST_SUITE_LOG)
+EXTRA_DIST += $(perf_TESTS)
+
+clean-local: clean-local-check
+.PHONY: clean-local-check
+clean-local-check:
+ $(AM_V_GEN)$(PERL) $(srcdir)/t/ax/deltree.pl t/*.dir t/*/*.dir */t/*.dir
+
+# vim: ft=automake noet
--
cgit v1.2.1
From 274590d84cf18c4cdbab10b59072169f07c13256 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Thu, 14 Sep 2017 21:01:19 +0200
Subject: Revert "automake: Handle LTLIBOBJS more specifically"
This reverts commit 5521219348c55af354878583b99c5f9d66d6d38a.
---
bin/automake.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/bin/automake.in b/bin/automake.in
index 3433d3de7..4294736aa 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -2358,8 +2358,9 @@ sub handle_LIBOBJS_or_ALLOCA
if $relative_dir ne '.';
define_variable ('LIBOBJDIR', "$dir", INTERNAL);
$clean_files{"\$($var)"} = MOSTLY_CLEAN;
- # libtool might create LIBOBJS as a side-effect of using LTLIBOBJS.
- $clean_files{"\$(LIBOBJS)"} = MOSTLY_CLEAN if $var eq "LTLIBOBJS";
+ # libtool might create LIBOBJS or ALLOCA as a side-effect of using
+ # LTLIBOBJS or LTALLOCA.
+ $clean_files{"\$($var)"} = MOSTLY_CLEAN if $var =~ s/^LT//;
}
else
{
--
cgit v1.2.1
From 333b98f2d108111e9a99e7ede17de7f0a1adba03 Mon Sep 17 00:00:00 2001
From: Michael Haubenwallner
Date: Wed, 16 Aug 2017 18:16:12 +0200
Subject: automake: Depend on LIBOBJDIR for LIBOBJS and ALLOCA
This change fixes automake bug#27781.
* bin/automake.in: Add Makefile dependency on LIBOBJDIR/dirstamp for
each LIBOBJS/ALLOCA source file found.
* t/list-of-tests.mk (XFAIL_TESTS): Drop
t/libobj-no-dependency-tracking.sh.
* NEWS: Announce bug fix.
---
NEWS | 5 +++++
bin/automake.in | 31 ++++++++++++++++++++-----------
t/list-of-tests.mk | 1 -
3 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/NEWS b/NEWS
index eb0a4155d..e50a95561 100644
--- a/NEWS
+++ b/NEWS
@@ -113,6 +113,11 @@ New in ?.?.?:
- Installed 'aclocal' m4 macros can now accept installation directories
containing '@' characters (automake bug#20903)
+ - When combining AC_LIBOBJ or AC_FUNC_ALLOCA with the
+ "--disable-dependency-tracking" configure option in an out of source
+ build, the build sub-directory defined by AC_CONFIG_LIBOBJ_DIR is now
+ properly created. (automake bug#27781)
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.15.1:
diff --git a/bin/automake.in b/bin/automake.in
index 4294736aa..9709f0638 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -2329,13 +2329,14 @@ sub handle_lib_objects
return $seen_libobjs;
}
-# handle_LIBOBJS_or_ALLOCA ($VAR)
-# -------------------------------
+# handle_LIBOBJS_or_ALLOCA ($VAR, $BASE)
+# --------------------------------------
# Definitions common to LIBOBJS and ALLOCA.
# VAR should be one of LIBOBJS, LTLIBOBJS, ALLOCA, or LTALLOCA.
+# BASE should be one base file name from AC_LIBSOURCE, or alloca.
sub handle_LIBOBJS_or_ALLOCA
{
- my ($var) = @_;
+ my ($var, $base) = @_;
my $dir = '';
@@ -2357,10 +2358,18 @@ sub handle_LIBOBJS_or_ALLOCA
$dir = backname ($relative_dir) . "/$dir"
if $relative_dir ne '.';
define_variable ('LIBOBJDIR', "$dir", INTERNAL);
- $clean_files{"\$($var)"} = MOSTLY_CLEAN;
- # libtool might create LIBOBJS or ALLOCA as a side-effect of using
+ if ($dir && !defined $clean_files{"$dir$base.\$(OBJEXT)"})
+ {
+ my $dirstamp = require_build_directory ($dir);
+ $output_rules .= "$dir$base.\$(OBJEXT): $dirstamp\n";
+ $output_rules .= "$dir$base.lo: $dirstamp\n"
+ if ($var =~ /^LT/);
+ }
+ # libtool might create .$(OBJEXT) as a side-effect of using
# LTLIBOBJS or LTALLOCA.
- $clean_files{"\$($var)"} = MOSTLY_CLEAN if $var =~ s/^LT//;
+ $clean_files{"$dir$base.\$(OBJEXT)"} = MOSTLY_CLEAN;
+ $clean_files{"$dir$base.lo"} = MOSTLY_CLEAN
+ if ($var =~ /^LT/);
}
else
{
@@ -2381,14 +2390,14 @@ sub handle_LIBOBJS
$var->requires_variables ("\@${lt}LIBOBJS\@ used", $lt . 'LIBOBJS')
if ! keys %libsources;
- my $dir = handle_LIBOBJS_or_ALLOCA "${lt}LIBOBJS";
-
foreach my $iter (keys %libsources)
{
- if ($iter =~ /\.[cly]$/)
+ my $dir = '';
+ if ($iter =~ /^(.*)(\.[cly])$/)
{
- saw_extension ($&);
+ saw_extension ($2);
saw_extension ('.c');
+ $dir = handle_LIBOBJS_or_ALLOCA ("${lt}LIBOBJS", $1);
}
if ($iter =~ /\.h$/)
@@ -2416,7 +2425,7 @@ sub handle_ALLOCA
my ($var, $cond, $lt) = @_;
my $myobjext = $lt ? 'lo' : 'o';
$lt ||= '';
- my $dir = handle_LIBOBJS_or_ALLOCA "${lt}ALLOCA";
+ my $dir = handle_LIBOBJS_or_ALLOCA ("${lt}ALLOCA", "alloca");
$dir eq '' and $dir = './';
$var->requires_variables ("\@${lt}ALLOCA\@ used", $lt . 'ALLOCA');
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index dab4a7c20..ebf965166 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -38,7 +38,6 @@ t/override-conditional-pr13940.sh \
t/dist-pr109765.sh \
t/instdir-cond2.sh \
t/java-nobase.sh \
-t/libobj-no-dependency-tracking.sh \
t/objext-pr10128.sh \
t/remake-timing-bug-pr8365.sh \
t/lex-subobj-nodep.sh \
--
cgit v1.2.1
From 7c25c996d1c7c212a5981aa0e9c4434b6f33f7b8 Mon Sep 17 00:00:00 2001
From: Reiner Herrmann
Date: Fri, 15 Sep 2017 11:43:53 +0200
Subject: mdate-sh: Ensure reproducible time output
This change fixes automake bug#20314.
'mdate-sh' pretty-prints the modification time of a file. But it's
output can vary depending on the timezone of the caller. Someone in
timezone GMT-12 will get a different result (day) than someone in
timezone GMT+12. As this output is also used to create/update stamp
files, which influence the further build process, the build result can
vary.
* lib/mdate-sh: Set 'TZ' to UTC which ensures reproducible output.
* NEWS: Announce bug fix.
Copyright-paperwork-exempt: yes
---
NEWS | 3 +++
lib/mdate-sh | 6 +++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index e50a95561..c7a83a20c 100644
--- a/NEWS
+++ b/NEWS
@@ -118,6 +118,9 @@ New in ?.?.?:
build, the build sub-directory defined by AC_CONFIG_LIBOBJ_DIR is now
properly created. (automake bug#27781)
+ - The time printed by 'mdate-sh' is now using the UTC time zone to support
+ the reproducible build effort. (automake bug#20314)
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.15.1:
diff --git a/lib/mdate-sh b/lib/mdate-sh
index f80075c04..b6a116f92 100755
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Get modification time of a file or directory and pretty-print it.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2017-09-15.09; # UTC
# Copyright (C) 1995-2017 Free Software Foundation, Inc.
# written by Ulrich Drepper , June 1995
@@ -74,6 +74,10 @@ export LC_ALL
LC_TIME=C
export LC_TIME
+# Use UTC to get reproducible result.
+TZ=UTC
+export TZ
+
# GNU ls changes its time format in response to the TIME_STYLE
# variable. Since we cannot assume 'unset' works, revert this
# variable to its documented default.
--
cgit v1.2.1
From 29408e8b1d6efec3a416a761742e5cceae381d19 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin
Date: Fri, 15 Sep 2017 12:04:19 +0200
Subject: maint: Document how to handle assignment exemption
* HACKING: Update.
---
HACKING | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/HACKING b/HACKING
index e34870b84..3a0b22cca 100644
--- a/HACKING
+++ b/HACKING
@@ -274,6 +274,12 @@
... removed in commit 'v1.11-1674-g02e9072' of 01-01-2012,
"dist: ditch support for lzma"...
+* If the commit is a tiny change that is exempt from copyright paperwork, the
+ commit message should contain a separate line after the detailed list of
+ touched files like the following:
+
+ Copyright-paperwork-exempt: yes
+
============================================================================
= Test suite
--
cgit v1.2.1
From 199e7a445040270fa5ef67623c56cde40d765199 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Sat, 16 Sep 2017 13:03:36 -0700
Subject: Prefer https: URLs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
In Gnulib, Emacs, etc. we are changing ftp: and http: URLs to use
https:, to discourage man-in-the-middle attacks when downloading
software. The attached patch propagates these changes upstream to
Automake. This patch does not affect files that Automake is
downstream of, which I'll patch separately.
Althouth the resources are not secret, plain HTTP is vulnerable to
malicious routers that tamper with responses from GNU servers,
and this sort of thing is all too common when people in some other
countries browse US-based websites. See, for example:
Aceto G, Botta A, Pescapé A, Awan MF, Ahmad T, Qaisar
S. Analyzing internet censorship in Pakistan. RTSI
2016. https://dx.doi.org/10.1109/RTSI.2016.7740626
HTTPS is not a complete solution here, but it can be a significant
help. The GNU project regularly serves up code to users, so we should
take some care here.
---
GNUmakefile | 2 +-
HACKING | 4 +-
Makefile.am | 2 +-
NEWS | 10 ++---
PLANS/obsolete-removed/am-prog-mkdir-p.txt | 10 ++---
PLANS/subdir-objects.txt | 8 ++--
PLANS/texi/drop-split-info-files.txt | 6 +--
README | 8 ++--
bin/aclocal.in | 8 ++--
bin/automake.in | 6 +--
bin/local.mk | 2 +-
bootstrap | 2 +-
configure.ac | 4 +-
contrib/check-html.am | 2 +-
contrib/multilib/README | 2 +-
contrib/t/help-multilib.sh | 2 +-
contrib/t/local.mk | 2 +-
contrib/t/multilib.sh | 2 +-
contrib/t/parallel-tests-html-recursive.sh | 2 +-
contrib/t/parallel-tests-html.sh | 2 +-
contrib/tap-driver.pl | 2 +-
doc/automake.texi | 16 +++----
doc/help2man | 6 +--
doc/local.mk | 2 +-
gen-testsuite-part | 2 +-
lib/Automake/ChannelDefs.pm | 2 +-
lib/Automake/Channels.pm | 2 +-
lib/Automake/Condition.pm | 2 +-
lib/Automake/Config.in | 2 +-
lib/Automake/Configure_ac.pm | 2 +-
lib/Automake/DisjConditions.pm | 2 +-
lib/Automake/FileUtils.pm | 2 +-
lib/Automake/General.pm | 2 +-
lib/Automake/Getopt.pm | 2 +-
lib/Automake/Item.pm | 2 +-
lib/Automake/ItemDef.pm | 2 +-
lib/Automake/Language.pm | 2 +-
lib/Automake/Location.pm | 2 +-
lib/Automake/Options.pm | 2 +-
lib/Automake/Rule.pm | 2 +-
lib/Automake/RuleDef.pm | 2 +-
lib/Automake/VarDef.pm | 2 +-
lib/Automake/Variable.pm | 2 +-
lib/Automake/Version.pm | 2 +-
lib/Automake/Wrap.pm | 2 +-
lib/Automake/XFile.pm | 2 +-
lib/Automake/local.mk | 2 +-
lib/am/check.am | 4 +-
lib/am/check2.am | 2 +-
lib/am/clean-hdr.am | 2 +-
lib/am/clean.am | 2 +-
lib/am/compile.am | 2 +-
lib/am/configure.am | 2 +-
lib/am/data.am | 2 +-
lib/am/dejagnu.am | 2 +-
lib/am/depend.am | 2 +-
lib/am/depend2.am | 2 +-
lib/am/distdir.am | 2 +-
lib/am/footer.am | 2 +-
lib/am/header-vars.am | 2 +-
lib/am/header.am | 2 +-
lib/am/inst-vars.am | 2 +-
lib/am/install.am | 2 +-
lib/am/java.am | 2 +-
lib/am/lang-compile.am | 2 +-
lib/am/lex.am | 2 +-
lib/am/library.am | 2 +-
lib/am/libs.am | 2 +-
lib/am/libtool.am | 2 +-
lib/am/lisp.am | 2 +-
lib/am/local.mk | 2 +-
lib/am/ltlib.am | 2 +-
lib/am/ltlibrary.am | 2 +-
lib/am/mans-vars.am | 2 +-
lib/am/mans.am | 2 +-
lib/am/program.am | 2 +-
lib/am/progs.am | 2 +-
lib/am/python.am | 2 +-
lib/am/remake-hdr.am | 2 +-
lib/am/scripts.am | 2 +-
lib/am/subdirs.am | 3 +-
lib/am/tags.am | 2 +-
lib/am/texi-vers.am | 2 +-
lib/am/texibuild.am | 6 +--
lib/am/texinfos.am | 6 +--
lib/am/vala.am | 2 +-
lib/am/yacc.am | 2 +-
lib/ar-lib | 2 +-
lib/compile | 4 +-
lib/depcomp | 4 +-
lib/local.mk | 2 +-
lib/mdate-sh | 4 +-
lib/missing | 6 +--
lib/py-compile | 4 +-
lib/tap-driver.sh | 4 +-
lib/test-driver | 4 +-
lib/ylwrap | 4 +-
m4/init.m4 | 2 +-
m4/local.mk | 2 +-
maintainer/am-ft | 2 +-
maintainer/am-xft | 2 +-
maintainer/check-perl-protos | 2 +-
maintainer/maint.mk | 6 +--
maintainer/rename-tests | 2 +-
maintainer/syntax-checks.mk | 2 +-
old/ChangeLog.03 | 4 +-
old/ChangeLog.04 | 2 +-
old/ChangeLog.09 | 14 +++---
old/ChangeLog.11 | 50 +++++++++++-----------
old/TODO | 6 +--
pre-inst-env.in | 2 +-
t/CheckListOfTests.am | 2 +-
t/ac-output-old.tap | 2 +-
t/aclocal-I-and-install.sh | 2 +-
t/aclocal-I-order-1.sh | 2 +-
t/aclocal-I-order-2.sh | 2 +-
t/aclocal-I-order-3.sh | 2 +-
t/aclocal-acdir.sh | 2 +-
t/aclocal-amflags.sh | 2 +-
t/aclocal-autoconf-version-check.sh | 2 +-
t/aclocal-comments-respected.sh | 2 +-
t/aclocal-deleted-header-aclocal-amflags.sh | 2 +-
t/aclocal-deleted-header.sh | 2 +-
t/aclocal-deps-subdir.sh | 2 +-
t/aclocal-deps.sh | 2 +-
t/aclocal-dirlist-abspath.sh | 2 +-
t/aclocal-dirlist-globbing.sh | 2 +-
t/aclocal-dirlist.sh | 2 +-
t/aclocal-install-absdir.sh | 2 +-
t/aclocal-install-fail.sh | 2 +-
t/aclocal-install-mkdir.sh | 2 +-
...local-m4-include-are-scanned-aclocal-amflags.sh | 2 +-
t/aclocal-m4-include-are-scanned.sh | 2 +-
t/aclocal-m4-sinclude.sh | 2 +-
t/aclocal-macrodir.tap | 2 +-
t/aclocal-macrodirs.tap | 2 +-
t/aclocal-missing-macros.sh | 2 +-
t/aclocal-no-extra-scan.sh | 2 +-
t/aclocal-no-force.sh | 2 +-
t/aclocal-no-install-no-mkdir.sh | 2 +-
t/aclocal-no-symlinked-overwrite.sh | 2 +-
t/aclocal-no-unused-required.sh | 2 +-
t/aclocal-path-install-serial.sh | 2 +-
t/aclocal-path-install.sh | 2 +-
t/aclocal-path-nonexistent.sh | 2 +-
t/aclocal-path-precedence.sh | 2 +-
t/aclocal-path.sh | 2 +-
t/aclocal-pr450.sh | 2 +-
t/aclocal-print-acdir.sh | 2 +-
t/aclocal-remake-misc.sh | 2 +-
t/aclocal-req.sh | 2 +-
t/aclocal-scan-configure-ac-pr319.sh | 2 +-
t/aclocal-serial.sh | 2 +-
t/aclocal-underquoted-defun.sh | 2 +-
t/aclocal-verbose-install.sh | 2 +-
t/aclocal.sh | 2 +-
t/acsilent.sh | 2 +-
t/acsubst.sh | 2 +-
t/acsubst2.sh | 2 +-
t/add-missing-install-sh.sh | 2 +-
t/add-missing-multiple.sh | 2 +-
t/add-missing.tap | 2 +-
t/all.sh | 2 +-
t/all2.sh | 2 +-
t/alloca.sh | 2 +-
t/alloca2.sh | 2 +-
t/alpha.sh | 2 +-
t/alpha2.sh | 2 +-
t/am-config-header.sh | 2 +-
t/am-default-source-ext.sh | 2 +-
t/am-include-only-one-generated-fragment.sh | 2 +-
t/am-macro-not-found.sh | 2 +-
t/am-missing-prog.sh | 2 +-
t/am-prog-cc-c-o.sh | 2 +-
t/am-prog-cc-stdc.sh | 2 +-
t/am-prog-mkdir-p.sh | 2 +-
t/am-tests-environment.sh | 2 +-
t/amassign.sh | 2 +-
t/amhello-binpkg.sh | 2 +-
t/amhello-cflags.sh | 2 +-
t/amhello-cross-compile.sh | 2 +-
t/aminit-moreargs-deprecation.sh | 2 +-
t/aminit-trailing-dnl-comment-pr16841.sh | 2 +-
t/amopt.sh | 2 +-
t/amopts-location.sh | 2 +-
t/amopts-variable-expansion.sh | 2 +-
t/amsubst.sh | 2 +-
t/ansi2knr-no-more.sh | 2 +-
t/ar-lib.sh | 2 +-
t/ar-lib2.sh | 2 +-
t/ar-lib3.sh | 2 +-
t/ar-lib4.sh | 2 +-
t/ar-lib5a.sh | 2 +-
t/ar-lib5b.sh | 2 +-
t/ar-lib6a.sh | 2 +-
t/ar-lib6b.sh | 2 +-
t/ar-lib7.sh | 2 +-
t/ar.sh | 2 +-
t/ar2.sh | 2 +-
t/ar3.sh | 2 +-
t/ar4.sh | 2 +-
t/ar5.sh | 2 +-
t/asm.sh | 2 +-
t/asm2.sh | 2 +-
t/asm3.sh | 2 +-
t/autodist-acconfig-no-subdir.sh | 2 +-
t/autodist-acconfig.sh | 2 +-
t/autodist-aclocal-m4.sh | 2 +-
t/autodist-config-headers.sh | 2 +-
t/autodist-configure-no-subdir.sh | 2 +-
t/autodist-no-duplicate.sh | 2 +-
t/autodist-stamp-vti.sh | 2 +-
t/autodist-subdir.sh | 4 +-
t/autodist.sh | 2 +-
t/autohdr-subdir-pr12495.sh | 2 +-
t/autohdr.sh | 2 +-
t/autohdr3.sh | 2 +-
t/autohdr4.sh | 2 +-
t/autohdrdry.sh | 2 +-
t/automake-cmdline.tap | 2 +-
t/auxdir-autodetect.sh | 2 +-
t/auxdir-cc-pr15981.sh | 2 +-
t/auxdir-computed.tap | 2 +-
t/auxdir-misplaced.sh | 2 +-
t/auxdir-nonexistent.sh | 2 +-
t/auxdir-pr15981.sh | 2 +-
t/auxdir-pr19311.sh | 2 +-
t/auxdir-unportable.tap | 2 +-
t/auxdir.sh | 2 +-
t/auxdir6.sh | 2 +-
t/auxdir7.sh | 2 +-
t/auxdir8.sh | 2 +-
t/ax/am-test-lib.sh | 4 +-
t/ax/cc-no-c-o.in | 2 +-
t/ax/deltree.pl | 2 +-
t/ax/depcomp.sh | 12 +++---
t/ax/distcheck-hook-m4.am | 2 +-
t/ax/extract-testsuite-summary.pl | 2 +-
t/ax/is | 2 +-
t/ax/is_newest | 2 +-
t/ax/runtest.in | 2 +-
t/ax/shell-no-trail-bslash.in | 2 +-
t/ax/tap-functions.sh | 2 +-
t/ax/tap-setup.sh | 2 +-
t/ax/tap-summary-aux.sh | 2 +-
t/ax/test-defs.in | 4 +-
t/ax/test-init.sh | 2 +-
t/ax/test-lib.sh | 2 +-
t/ax/testsuite-summary-checks.sh | 2 +-
t/ax/trivial-test-driver | 2 +-
t/backcompat-acout.sh | 2 +-
t/backcompat.sh | 2 +-
t/backcompat2.sh | 2 +-
t/backcompat3.sh | 2 +-
t/backcompat6.sh | 2 +-
t/backslash-before-trailing-whitespace.sh | 2 +-
t/backslash-issues.sh | 2 +-
t/badline.sh | 2 +-
t/badopt.sh | 2 +-
t/badprog.sh | 2 +-
t/built-sources-check.sh | 2 +-
t/built-sources-cond.sh | 2 +-
t/built-sources-fork-bomb.sh | 6 +--
t/built-sources-install.sh | 2 +-
t/built-sources-subdir.sh | 2 +-
t/built-sources.sh | 2 +-
t/c-demo.sh | 4 +-
t/candist.sh | 2 +-
t/canon-name.sh | 2 +-
t/canon.sh | 2 +-
t/canon2.sh | 2 +-
t/canon3.sh | 2 +-
t/canon4.sh | 2 +-
t/canon5.sh | 2 +-
t/canon6.sh | 2 +-
t/canon7.sh | 2 +-
t/canon8.sh | 2 +-
t/ccnoco-deps.sh | 2 +-
t/ccnoco-lib.sh | 2 +-
t/ccnoco-lt.sh | 2 +-
t/ccnoco.sh | 2 +-
t/ccnoco3.sh | 2 +-
t/ccnoco4.sh | 6 +--
t/check-concurrency-bug9245.sh | 2 +-
t/check-exported-srcdir.sh | 2 +-
t/check-fd-redirect.sh | 2 +-
t/check-no-test-driver.sh | 2 +-
t/check-subst-prog.sh | 2 +-
t/check-subst.sh | 2 +-
t/check-tests-in-builddir.sh | 2 +-
t/check.sh | 2 +-
t/check10.sh | 2 +-
t/check11.sh | 2 +-
t/check12.sh | 2 +-
t/check2.sh | 2 +-
t/check4.sh | 2 +-
t/check5.sh | 2 +-
t/check6.sh | 2 +-
t/check7.sh | 2 +-
t/check8.sh | 2 +-
t/checkall.sh | 2 +-
t/clean.sh | 2 +-
t/colneq.sh | 2 +-
t/colneq2.sh | 2 +-
t/colneq3.sh | 2 +-
t/colon.sh | 2 +-
t/colon2.sh | 2 +-
t/colon3.sh | 2 +-
t/colon4.sh | 2 +-
t/colon5.sh | 2 +-
t/colon6.sh | 2 +-
t/colon7.sh | 2 +-
t/color-tests-opt.sh | 2 +-
t/color-tests.sh | 2 +-
t/color-tests2.sh | 2 +-
t/commen10.sh | 2 +-
t/commen11.sh | 2 +-
t/comment-block.sh | 2 +-
t/comment.sh | 2 +-
t/comment2.sh | 2 +-
t/comment3.sh | 2 +-
t/comment4.sh | 2 +-
t/comment5.sh | 2 +-
t/comment6.sh | 2 +-
t/comment7.sh | 2 +-
t/comment8.sh | 2 +-
t/comment9.sh | 2 +-
t/comments-in-var-def.sh | 2 +-
t/compile.sh | 2 +-
t/compile2.sh | 2 +-
t/compile3.sh | 2 +-
t/compile4.sh | 2 +-
t/compile5.sh | 2 +-
t/compile6.sh | 2 +-
t/compile7.sh | 2 +-
t/compile_f90_c_cxx.sh | 2 +-
t/compile_f_c_cxx.sh | 2 +-
t/cond-basic.sh | 2 +-
t/cond.sh | 2 +-
t/cond10.sh | 2 +-
t/cond11.sh | 2 +-
t/cond13.sh | 2 +-
t/cond14.sh | 2 +-
t/cond15.sh | 2 +-
t/cond16.sh | 2 +-
t/cond17.sh | 2 +-
t/cond18.sh | 2 +-
t/cond19.sh | 2 +-
t/cond20.sh | 2 +-
t/cond21.sh | 2 +-
t/cond22.sh | 2 +-
t/cond23.sh | 2 +-
t/cond24.sh | 2 +-
t/cond25.sh | 2 +-
t/cond26.sh | 2 +-
t/cond27.sh | 2 +-
t/cond28.sh | 2 +-
t/cond3.sh | 2 +-
t/cond30.sh | 2 +-
t/cond31.sh | 2 +-
t/cond32.sh | 2 +-
t/cond33.sh | 2 +-
t/cond34.sh | 2 +-
t/cond35.sh | 2 +-
t/cond36.sh | 2 +-
t/cond37.sh | 2 +-
t/cond38.sh | 2 +-
t/cond39.sh | 2 +-
t/cond4.sh | 2 +-
t/cond40.sh | 2 +-
t/cond41.sh | 2 +-
t/cond42.sh | 2 +-
t/cond43.sh | 2 +-
t/cond44.sh | 2 +-
t/cond45.sh | 2 +-
t/cond46.sh | 2 +-
t/cond5.sh | 2 +-
t/cond6.sh | 2 +-
t/cond7.sh | 2 +-
t/cond8.sh | 2 +-
t/cond9.sh | 2 +-
t/condd.sh | 2 +-
t/condhook.sh | 2 +-
t/condhook2.sh | 2 +-
t/condinc.sh | 2 +-
t/condinc2.sh | 2 +-
t/condlib.sh | 2 +-
t/condman2.sh | 2 +-
t/condman3.sh | 2 +-
t/confdeps.sh | 2 +-
t/conff.sh | 2 +-
t/conff2.sh | 2 +-
t/conffile-leading-dot.sh | 2 +-
t/confh-subdir-clean.sh | 2 +-
t/confh.sh | 2 +-
t/confh4.sh | 2 +-
t/confh5.sh | 2 +-
t/confh6.sh | 2 +-
t/confh7.sh | 2 +-
t/confh8.sh | 2 +-
t/configure.sh | 2 +-
t/confincl.sh | 2 +-
t/conflnk.sh | 2 +-
t/conflnk2.sh | 2 +-
t/conflnk3.sh | 2 +-
t/conflnk4.sh | 2 +-
t/confsub.sh | 2 +-
t/confvar.sh | 2 +-
t/confvar2.sh | 2 +-
t/copy.sh | 2 +-
t/cscope.tap | 2 +-
t/cscope2.sh | 2 +-
t/cscope3.sh | 2 +-
t/cxx-demo.sh | 2 +-
t/cxx-lt-demo.sh | 2 +-
t/cxx.sh | 2 +-
t/cxx2.sh | 2 +-
t/cxxcpp.sh | 2 +-
t/cxxlibobj.sh | 2 +-
t/cxxlink.sh | 2 +-
t/cxxnoc.sh | 2 +-
t/cygnus-no-more.sh | 2 +-
t/cygwin32.sh | 2 +-
t/dash.sh | 2 +-
t/defun.sh | 2 +-
t/defun2.sh | 2 +-
t/dejagnu-absolute-builddir.sh | 2 +-
t/dejagnu-relative-srcdir.sh | 2 +-
t/dejagnu-siteexp-append.sh | 2 +-
t/dejagnu-siteexp-extend.sh | 2 +-
t/dejagnu-siteexp-useredit.sh | 2 +-
t/dejagnu.sh | 2 +-
t/dejagnu2.sh | 2 +-
t/dejagnu3.sh | 2 +-
t/dejagnu4.sh | 2 +-
t/dejagnu5.sh | 2 +-
t/dejagnu6.sh | 2 +-
t/dejagnu7.sh | 2 +-
t/deleted-am.sh | 2 +-
t/deleted-m4.sh | 2 +-
t/depacl2.sh | 2 +-
t/depcomp-implicit-auxdir.sh | 2 +-
t/depcomp.sh | 2 +-
t/depcomp2.sh | 2 +-
t/depcomp8a.sh | 2 +-
t/depcomp8b.sh | 2 +-
t/depdist.sh | 2 +-
t/depend-postproc.sh | 2 +-
t/depend.sh | 2 +-
t/depend3.sh | 2 +-
t/depend4.sh | 2 +-
t/depend5.sh | 2 +-
t/depend6.sh | 2 +-
t/deprecated-acinit.sh | 2 +-
t/destdir.sh | 2 +-
t/dir-named-obj-is-bad.sh | 2 +-
t/discover.sh | 2 +-
t/dist-auxdir-many-subdirs.sh | 2 +-
t/dist-auxfile-2.sh | 2 +-
t/dist-auxfile.sh | 2 +-
t/dist-formats.tap | 2 +-
t/dist-included-parent-dir.sh | 2 +-
t/dist-install-sh.sh | 2 +-
t/dist-lzma.sh | 2 +-
t/dist-missing-am.sh | 2 +-
t/dist-missing-included-m4.sh | 2 +-
t/dist-missing-m4.sh | 2 +-
t/dist-pr109765.sh | 2 +-
t/dist-readonly.sh | 2 +-
t/dist-repeated.sh | 2 +-
t/dist-shar.sh | 2 +-
t/dist-tarZ.sh | 2 +-
t/dist-with-unreadable-makefile-fails.sh | 2 +-
t/distcheck-Tpo.sh | 2 +-
t/distcheck-configure-flags-am.sh | 2 +-
t/distcheck-configure-flags-subpkg.sh | 2 +-
t/distcheck-configure-flags.sh | 2 +-
t/distcheck-hook.sh | 2 +-
t/distcheck-hook2.sh | 2 +-
t/distcheck-missing-m4.sh | 2 +-
t/distcheck-no-prefix-or-srcdir-override.sh | 2 +-
t/distcheck-outdated-m4.sh | 2 +-
t/distcheck-override-infodir.sh | 2 +-
t/distcheck-pr10470.sh | 2 +-
t/distcheck-pr18286.sh | 2 +-
t/distcheck-pr9579.sh | 2 +-
t/distcheck-writable-srcdir.sh | 2 +-
t/distcleancheck.sh | 2 +-
t/distcom-subdir.sh | 2 +-
t/distcom2.sh | 2 +-
t/distcom3.sh | 2 +-
t/distcom4.sh | 2 +-
t/distcom5.sh | 2 +-
t/distdir.sh | 2 +-
t/disthook.sh | 2 +-
t/distlinks.sh | 2 +-
t/distlinksbrk.sh | 2 +-
t/distname.sh | 2 +-
t/dmalloc.sh | 2 +-
t/doc-parsing-buglets-colneq-subst.sh | 4 +-
t/doc-parsing-buglets-tabs.sh | 2 +-
t/dollar.sh | 2 +-
t/dollarvar.sh | 2 +-
t/dollarvar2.sh | 2 +-
t/double.sh | 2 +-
t/dup2.sh | 2 +-
t/else.sh | 2 +-
t/empty-data-primary.sh | 2 +-
t/empty-sources-primary.tap | 2 +-
t/exdir.sh | 2 +-
t/exdir2.sh | 2 +-
t/exdir3.sh | 2 +-
t/exeext.sh | 2 +-
t/exeext2.sh | 2 +-
t/exeext3.sh | 2 +-
t/exeext4.sh | 2 +-
t/ext.sh | 2 +-
t/ext2.sh | 2 +-
t/ext3.sh | 2 +-
t/extra-data.sh | 2 +-
t/extra-deps-lt.sh | 2 +-
t/extra-deps.sh | 2 +-
t/extra-dist-dirs-and-subdirs.sh | 2 +-
t/extra-dist-vpath-dir-merge.sh | 2 +-
t/extra-dist-vpath-dir.sh | 2 +-
t/extra-dist-wildcards-gnu.sh | 2 +-
t/extra-dist-wildcards-vpath.sh | 2 +-
t/extra-dist-wildcards.sh | 2 +-
t/extra-portability.sh | 2 +-
t/extra-portability2.sh | 2 +-
t/extra-portability3.sh | 2 +-
t/extra-programs-and-libs.sh | 2 +-
t/extra-programs-empty.sh | 2 +-
t/extra-programs-misc.sh | 2 +-
t/extra-sources-no-spurious.sh | 2 +-
t/extra-sources.sh | 2 +-
t/extra.sh | 2 +-
t/f90only.sh | 2 +-
t/flavor.sh | 2 +-
t/flibs.sh | 2 +-
t/fn99.sh | 2 +-
t/fn99subdir.sh | 2 +-
t/fnoc.sh | 2 +-
t/fonly.sh | 2 +-
t/forcemiss.sh | 2 +-
t/forcemiss2.sh | 2 +-
t/fort1.sh | 2 +-
t/fort2.sh | 2 +-
t/fort4.sh | 2 +-
t/fort5.sh | 2 +-
t/fortdep.sh | 2 +-
t/gcj.sh | 2 +-
t/gcj2.sh | 2 +-
t/gcj3.sh | 2 +-
t/gcj4.sh | 2 +-
t/gcj5.sh | 2 +-
t/gcj6.sh | 2 +-
t/get-sysconf.sh | 2 +-
t/gettext-basics.sh | 2 +-
t/gettext-config-rpath.sh | 2 +-
t/gettext-external-pr338.sh | 2 +-
t/gettext-intl-subdir.sh | 2 +-
t/gettext-macros.sh | 4 +-
t/gettext-pr381.sh | 2 +-
t/gnits.sh | 2 +-
t/gnits2.sh | 2 +-
t/gnits3.sh | 2 +-
t/gnumake.sh | 2 +-
t/gnuwarn.sh | 2 +-
t/gnuwarn2.sh | 2 +-
t/hdr-vars-defined-once.sh | 2 +-
t/header.sh | 2 +-
t/help-depend.sh | 2 +-
t/help-depend2.sh | 2 +-
t/help-dmalloc.sh | 2 +-
t/help-init.sh | 2 +-
t/help-lispdir.sh | 2 +-
t/help-python.sh | 2 +-
t/help-silent.sh | 2 +-
t/help-upc.sh | 2 +-
t/help.sh | 2 +-
t/help2.sh | 2 +-
t/help3.sh | 2 +-
t/help4.sh | 2 +-
t/hfs.sh | 2 +-
t/implicit.sh | 2 +-
t/includes-deprecation.sh | 2 +-
t/init.sh | 2 +-
t/init2.sh | 2 +-
t/install-info-dir.sh | 2 +-
t/install-sh-option-C.sh | 2 +-
t/install-sh-unittests.sh | 2 +-
t/installdir.sh | 2 +-
t/instdat.sh | 2 +-
t/instdat2.sh | 2 +-
t/instdir-cond.sh | 2 +-
t/instdir-cond2.sh | 2 +-
t/instdir-java.sh | 2 +-
t/instdir-lisp.sh | 2 +-
t/instdir-ltlib.sh | 2 +-
t/instdir-no-empty.sh | 2 +-
t/instdir-prog.sh | 2 +-
t/instdir-python.sh | 2 +-
t/instdir-texi.sh | 2 +-
t/instdir.sh | 2 +-
t/instdir2.sh | 2 +-
t/instexec.sh | 2 +-
t/instfail-info.sh | 2 +-
t/instfail-java.sh | 2 +-
t/instfail-libtool.sh | 2 +-
t/instfail.sh | 2 +-
t/insthook.sh | 2 +-
t/instman.sh | 2 +-
t/instman2.sh | 2 +-
t/instmany-mans.sh | 2 +-
t/instmany-python.sh | 2 +-
t/instmany.sh | 2 +-
t/instspc.tap | 2 +-
t/interp.sh | 2 +-
t/interp2.sh | 2 +-
t/java-check.sh | 2 +-
t/java-clean.sh | 2 +-
t/java-compile-install.sh | 2 +-
t/java-compile-run-flat.sh | 2 +-
t/java-compile-run-nested.sh | 2 +-
t/java-empty-classpath.sh | 2 +-
t/java-extra.sh | 2 +-
t/java-mix.sh | 2 +-
t/java-no-duplicate.sh | 2 +-
t/java-nobase.sh | 2 +-
t/java-noinst.sh | 2 +-
t/java-rebuild.sh | 2 +-
t/java-sources.sh | 2 +-
t/java-uninstall.sh | 2 +-
t/java.sh | 2 +-
t/java2.sh | 2 +-
t/java3.sh | 2 +-
t/javadir-undefined.sh | 2 +-
t/javaflags.sh | 2 +-
t/javaprim.sh | 2 +-
t/javasubst.sh | 2 +-
t/ldadd.sh | 2 +-
t/ldflags.sh | 2 +-
t/lex-clean-cxx.sh | 2 +-
t/lex-clean.sh | 2 +-
t/lex-depend-cxx.sh | 2 +-
t/lex-depend-grep.sh | 2 +-
t/lex-depend.sh | 2 +-
t/lex-header.sh | 2 +-
t/lex-lib-external.sh | 2 +-
t/lex-lib.sh | 2 +-
t/lex-libobj.sh | 2 +-
t/lex-line.sh | 2 +-
t/lex-multiple.sh | 6 +--
t/lex-nodist.sh | 2 +-
t/lex-noyywrap.sh | 2 +-
t/lex-pr204.sh | 2 +-
t/lex-subobj-nodep.sh | 2 +-
t/lex.sh | 2 +-
t/lex2.sh | 2 +-
t/lex3.sh | 2 +-
t/lex5.sh | 2 +-
t/lexcpp.sh | 2 +-
t/lexvpath.sh | 2 +-
t/lflags-cxx.sh | 2 +-
t/lflags.sh | 2 +-
t/libexec.sh | 2 +-
t/libobj-basic.sh | 2 +-
t/libobj-no-dependency-tracking.sh | 2 +-
t/libobj10.sh | 2 +-
t/libobj12.sh | 2 +-
t/libobj13.sh | 2 +-
t/libobj14.sh | 2 +-
t/libobj15a.sh | 2 +-
t/libobj15b.sh | 4 +-
t/libobj15c.sh | 4 +-
t/libobj16a.sh | 2 +-
t/libobj16b.sh | 2 +-
t/libobj17.sh | 2 +-
t/libobj18.sh | 2 +-
t/libobj19.sh | 2 +-
t/libobj2.sh | 2 +-
t/libobj20a.sh | 2 +-
t/libobj20b.sh | 4 +-
t/libobj20c.sh | 2 +-
t/libobj3.sh | 2 +-
t/libobj4.sh | 2 +-
t/libobj5.sh | 2 +-
t/libobj7.sh | 2 +-
t/library.sh | 2 +-
t/library2.sh | 2 +-
t/library3.sh | 2 +-
t/libtoo10.sh | 2 +-
t/libtoo11.sh | 2 +-
t/libtool-macros.sh | 2 +-
t/libtool.sh | 2 +-
t/libtool2.sh | 2 +-
t/libtool3.sh | 2 +-
t/libtool4.sh | 2 +-
t/libtool5.sh | 2 +-
t/libtool6.sh | 2 +-
t/libtool7.sh | 2 +-
t/libtool8.sh | 2 +-
t/libtool9.sh | 2 +-
t/license.sh | 2 +-
t/license2.sh | 2 +-
t/link_c_cxx.sh | 2 +-
t/link_cond.sh | 2 +-
t/link_dist.sh | 2 +-
t/link_f90_only.sh | 2 +-
t/link_f_only.sh | 2 +-
t/link_fc.sh | 2 +-
t/link_fccxx.sh | 2 +-
t/link_fcxx.sh | 2 +-
t/link_override.sh | 2 +-
t/lisp-flags.sh | 2 +-
t/lisp-loadpath.sh | 2 +-
t/lisp-pr11806.sh | 2 +-
t/lisp-subdir-mix.sh | 2 +-
t/lisp-subdir.sh | 2 +-
t/lisp-subdir2.sh | 2 +-
t/lisp2.sh | 2 +-
t/lisp3.sh | 2 +-
t/lisp4.sh | 2 +-
t/lisp5.sh | 2 +-
t/lisp6.sh | 2 +-
t/lisp7.sh | 2 +-
t/lisp8.sh | 2 +-
t/lispdry.sh | 2 +-
t/list-of-tests.mk | 2 +-
t/listval.sh | 2 +-
t/local.mk | 2 +-
t/location.sh | 2 +-
t/longlin2.sh | 2 +-
t/longline.sh | 2 +-
t/ltcond.sh | 2 +-
t/ltcond2.sh | 2 +-
t/ltconv.sh | 2 +-
t/ltdeps.sh | 2 +-
t/ltinit.sh | 2 +-
t/ltinstloc.sh | 2 +-
t/ltlibobjs.sh | 2 +-
t/ltlibsrc.sh | 2 +-
t/ltorder.sh | 2 +-
t/m4-inclusion.sh | 2 +-
t/maintclean-vpath.sh | 2 +-
t/maintclean.sh | 2 +-
t/maintmode-configure-msg.sh | 2 +-
t/make-dryrun.tap | 2 +-
t/make-is-gnu.sh | 2 +-
t/make-keepgoing.tap | 2 +-
t/make.sh | 2 +-
t/makefile-deps.sh | 2 +-
t/makej.sh | 2 +-
t/makej2.sh | 2 +-
t/maken.sh | 2 +-
t/maken3.sh | 2 +-
t/makevars.sh | 2 +-
t/man.sh | 2 +-
t/man2.sh | 2 +-
t/man3.sh | 2 +-
t/man5.sh | 2 +-
t/man6.sh | 2 +-
t/man7.sh | 2 +-
t/man8.sh | 2 +-
t/mdate.sh | 2 +-
t/mdate2.sh | 2 +-
t/mdate3.sh | 2 +-
t/mdate4.sh | 2 +-
t/mdate5.sh | 2 +-
t/mdate6.sh | 2 +-
t/missing-auxfile-stops-makefiles-creation.sh | 2 +-
t/missing-version-mismatch.sh | 2 +-
t/missing3.sh | 2 +-
t/mkdirp-deprecation.sh | 2 +-
t/mkinst2.sh | 2 +-
t/mkinst3.sh | 2 +-
t/mkinstall.sh | 2 +-
t/mmode.sh | 2 +-
t/mmodely.sh | 2 +-
t/no-extra-c-stuff.sh | 2 +-
t/no-extra-makefile-code.sh | 4 +-
t/no-spurious-install-recursive.sh | 2 +-
t/nobase-libtool.sh | 2 +-
t/nobase-nodist.sh | 2 +-
t/nobase-python.sh | 2 +-
t/nobase.sh | 2 +-
t/nodef.sh | 2 +-
t/nodef2.sh | 2 +-
t/nodep.sh | 2 +-
t/nodep2.sh | 2 +-
t/nodepcomp.sh | 2 +-
t/nodist.sh | 2 +-
t/nodist2.sh | 2 +-
t/nodist3.sh | 2 +-
t/noinst.sh | 2 +-
t/noinstdir.sh | 2 +-
t/nolink.sh | 2 +-
t/nostdinc.sh | 2 +-
t/notrans.sh | 2 +-
t/number.sh | 2 +-
t/objc-deps.sh | 2 +-
t/objc-flags.sh | 2 +-
t/objc-megademo.sh | 2 +-
t/objc-minidemo.sh | 2 +-
t/objcxx-deps.sh | 2 +-
t/objcxx-flags.sh | 2 +-
t/objcxx-minidemo.sh | 2 +-
t/objext-pr10128.sh | 2 +-
t/oldvars.sh | 2 +-
t/order.sh | 2 +-
t/output-order.sh | 2 +-
t/output.sh | 2 +-
t/output10.sh | 2 +-
t/output11.sh | 2 +-
t/output12.sh | 2 +-
t/output13.sh | 2 +-
t/output2.sh | 2 +-
t/output3.sh | 2 +-
t/output4.sh | 2 +-
t/output5.sh | 2 +-
t/output6.sh | 2 +-
t/output7.sh | 2 +-
t/output8.sh | 2 +-
t/output9.sh | 2 +-
t/override-conditional-1.sh | 2 +-
t/override-conditional-2.sh | 2 +-
t/override-conditional-pr13940.sh | 2 +-
t/override-html.sh | 2 +-
t/override-suggest-local.sh | 2 +-
t/parallel-am.sh | 2 +-
t/parallel-am2.sh | 2 +-
t/parallel-am3.sh | 2 +-
t/parallel-tests-basics.sh | 2 +-
t/parallel-tests-cmdline-override.sh | 2 +-
t/parallel-tests-concurrency-2.sh | 2 +-
t/parallel-tests-concurrency.sh | 2 +-
t/parallel-tests-console-output.sh | 2 +-
t/parallel-tests-driver-install.sh | 2 +-
t/parallel-tests-dry-run-1.sh | 2 +-
t/parallel-tests-dry-run-2.sh | 2 +-
t/parallel-tests-empty-testlogs.sh | 2 +-
t/parallel-tests-empty.sh | 2 +-
t/parallel-tests-exeext.sh | 2 +-
t/parallel-tests-exit-status-reported.sh | 2 +-
t/parallel-tests-exit-statuses.sh | 2 +-
t/parallel-tests-extra-programs.sh | 2 +-
t/parallel-tests-fd-redirect-exeext.sh | 2 +-
t/parallel-tests-fd-redirect.sh | 2 +-
t/parallel-tests-fork-bomb.sh | 2 +-
t/parallel-tests-generated-and-distributed.sh | 2 +-
t/parallel-tests-harderror.sh | 2 +-
t/parallel-tests-interrupt.tap | 2 +-
t/parallel-tests-log-compiler-1.sh | 2 +-
t/parallel-tests-log-compiler-2.sh | 2 +-
t/parallel-tests-log-compiler-example.sh | 2 +-
t/parallel-tests-log-override-1.sh | 2 +-
t/parallel-tests-log-override-2.sh | 2 +-
t/parallel-tests-log-override-recheck.sh | 2 +-
t/parallel-tests-no-color-in-log.sh | 2 +-
t/parallel-tests-no-spurious-summary.sh | 2 +-
t/parallel-tests-once.sh | 2 +-
t/parallel-tests-recheck-depends-on-all.sh | 2 +-
t/parallel-tests-recheck-pr11791.sh | 2 +-
t/parallel-tests-recheck.sh | 2 +-
t/parallel-tests-reset-term.sh | 2 +-
t/parallel-tests-subdir.sh | 2 +-
t/parallel-tests-suffix-prog.sh | 2 +-
t/parallel-tests-suffix.sh | 2 +-
t/parallel-tests-trailing-whitespace.sh | 2 +-
t/parallel-tests-unreadable.sh | 2 +-
t/parse.sh | 2 +-
t/per-target-flags.sh | 2 +-
t/percent.sh | 2 +-
t/percent2.sh | 2 +-
t/perf/cond.sh | 2 +-
t/perf/testsuite-recheck.sh | 2 +-
t/perf/testsuite-summary.sh | 2 +-
t/phony.sh | 2 +-
t/pkg-config-macros.sh | 2 +-
t/pluseq.sh | 2 +-
t/pluseq10.sh | 2 +-
t/pluseq11.sh | 2 +-
t/pluseq2.sh | 2 +-
t/pluseq3.sh | 2 +-
t/pluseq4.sh | 2 +-
t/pluseq5.sh | 2 +-
t/pluseq6.sh | 2 +-
t/pluseq7.sh | 2 +-
t/pluseq8.sh | 2 +-
t/pluseq9.sh | 2 +-
t/pm/Cond2.pl | 2 +-
t/pm/Cond3.pl | 2 +-
t/pm/Condition-t.pl | 2 +-
t/pm/Condition.pl | 2 +-
t/pm/DisjCon2.pl | 2 +-
t/pm/DisjCon3.pl | 2 +-
t/pm/DisjConditions-t.pl | 2 +-
t/pm/DisjConditions.pl | 2 +-
t/pm/Version.pl | 2 +-
t/pm/Version2.pl | 2 +-
t/pm/Version3.pl | 2 +-
t/pm/Wrap.pl | 2 +-
t/posixsubst-data.sh | 2 +-
t/posixsubst-extradist.sh | 2 +-
t/posixsubst-ldadd.sh | 2 +-
t/posixsubst-libraries.sh | 2 +-
t/posixsubst-ltlibraries.sh | 2 +-
t/posixsubst-programs.sh | 2 +-
t/posixsubst-scripts.sh | 2 +-
t/posixsubst-sources.sh | 2 +-
t/posixsubst-tests.sh | 2 +-
t/ppf77.sh | 2 +-
t/pr2.sh | 2 +-
t/pr211.sh | 2 +-
t/pr220.sh | 2 +-
t/pr224.sh | 2 +-
t/pr229.sh | 2 +-
t/pr243.sh | 2 +-
t/pr266.sh | 2 +-
t/pr279-2.sh | 2 +-
t/pr279.sh | 2 +-
t/pr287.sh | 2 +-
t/pr300-lib.sh | 2 +-
t/pr300-ltlib.sh | 2 +-
t/pr300-prog.sh | 2 +-
t/pr307.sh | 2 +-
t/pr401.sh | 2 +-
t/pr401b.sh | 2 +-
t/pr401c.sh | 2 +-
t/pr72.sh | 2 +-
t/pr87.sh | 2 +-
t/pr9.sh | 2 +-
t/precious.sh | 2 +-
t/prefix.sh | 2 +-
t/preproc-basics.sh | 2 +-
t/preproc-c-compile.sh | 2 +-
t/preproc-demo.sh | 2 +-
t/preproc-errmsg.sh | 2 +-
t/primary-prefix-couples-documented-valid.sh | 2 +-
t/primary-prefix-couples-force-valid.sh | 2 +-
t/primary-prefix-invalid-couples.tap | 2 +-
t/primary-prefix-valid-couples.sh | 2 +-
t/primary.sh | 2 +-
t/primary2.sh | 2 +-
t/primary3.sh | 2 +-
t/print-libdir.sh | 2 +-
t/proginst.sh | 2 +-
t/programs-primary-rewritten.sh | 2 +-
t/py-compile-basedir.sh | 2 +-
t/py-compile-basic.sh | 2 +-
t/py-compile-destdir.sh | 2 +-
t/py-compile-env.sh | 2 +-
t/py-compile-option-terminate.sh | 2 +-
t/py-compile-usage.sh | 2 +-
t/python-am-path-iftrue.sh | 2 +-
t/python-dist.sh | 2 +-
t/python-missing.sh | 2 +-
t/python-pr10995.sh | 2 +-
t/python-too-old.sh | 2 +-
t/python-vars.sh | 2 +-
t/python-virtualenv.sh | 2 +-
t/python.sh | 2 +-
t/python10.sh | 2 +-
t/python11.sh | 2 +-
t/python12.sh | 2 +-
t/python2.sh | 2 +-
t/python3.sh | 2 +-
t/recurs-user-deeply-nested.sh | 2 +-
t/recurs-user-indir.sh | 2 +-
t/recurs-user-keep-going.sh | 2 +-
t/recurs-user-many.sh | 2 +-
t/recurs-user-no-subdirs.sh | 2 +-
t/recurs-user-no-top-level.sh | 2 +-
t/recurs-user-override.sh | 2 +-
t/recurs-user-phony.sh | 2 +-
t/recurs-user-wrap.sh | 2 +-
t/recurs-user.sh | 2 +-
t/recurs-user2.sh | 2 +-
t/relativize.tap | 2 +-
t/remake-aclocal-version-mismatch.sh | 2 +-
t/remake-after-acinclude-m4.sh | 2 +-
t/remake-after-aclocal-m4.sh | 2 +-
t/remake-after-configure-ac.sh | 2 +-
t/remake-after-makefile-am.sh | 2 +-
t/remake-all-1.sh | 2 +-
t/remake-all-2.sh | 2 +-
t/remake-am-pr10111.sh | 2 +-
t/remake-config-status-dependencies.sh | 2 +-
t/remake-configure-dependencies.sh | 2 +-
t/remake-deeply-nested.sh | 2 +-
t/remake-deleted-am-2.sh | 2 +-
t/remake-deleted-am-subdir.sh | 2 +-
t/remake-deleted-am.sh | 2 +-
t/remake-deleted-m4-file.sh | 2 +-
t/remake-fail.sh | 2 +-
t/remake-gnulib-add-acsubst.sh | 4 +-
t/remake-gnulib-add-header.sh | 4 +-
t/remake-gnulib-remove-header.sh | 4 +-
t/remake-include-aclocal.sh | 2 +-
t/remake-include-configure.sh | 2 +-
t/remake-include-makefile.sh | 2 +-
t/remake-m4-pr10111.sh | 2 +-
t/remake-macrodir.sh | 2 +-
t/remake-maintainer-mode.sh | 2 +-
t/remake-makefile-intree.sh | 2 +-
t/remake-makefile-vpath.sh | 2 +-
t/remake-mild-stress.sh | 2 +-
t/remake-moved-m4-file.sh | 2 +-
t/remake-not-after-make-dist.sh | 2 +-
t/remake-recurs-user.sh | 2 +-
t/remake-renamed-am.sh | 2 +-
t/remake-renamed-m4-file.sh | 2 +-
t/remake-renamed-m4-macro-and-file.sh | 2 +-
t/remake-renamed-m4-macro.sh | 2 +-
t/remake-subdir-from-subdir.sh | 2 +-
t/remake-subdir-gnu.sh | 2 +-
t/remake-subdir-grepping.sh | 2 +-
t/remake-subdir-long-time.sh | 2 +-
t/remake-subdir-no-makefile.sh | 2 +-
t/remake-subdir-only.sh | 2 +-
t/remake-subdir.sh | 2 +-
t/remake-subdir2.sh | 2 +-
t/remake-subdir3.sh | 2 +-
t/remake-timing-bug-pr8365.sh | 2 +-
t/repeated-options.sh | 2 +-
t/reqd2.sh | 2 +-
t/rm-f-probe.sh | 2 +-
t/rulepat.sh | 2 +-
t/sanity.sh | 2 +-
t/seenc.sh | 2 +-
t/self-check-cc-no-c-o.sh | 2 +-
t/self-check-configure-help.sh | 4 +-
t/self-check-dir.tap | 2 +-
t/self-check-exit.tap | 4 +-
t/self-check-explicit-skips.sh | 2 +-
t/self-check-is-blocked-signal.tap | 2 +-
t/self-check-is_newest.tap | 2 +-
t/self-check-me.tap | 2 +-
t/self-check-report.sh | 2 +-
t/self-check-seq.tap | 2 +-
t/self-check-shell-no-trail-bslash.sh | 2 +-
t/self-check-unindent.tap | 2 +-
t/serial-tests.sh | 2 +-
t/silent-c.sh | 2 +-
t/silent-configsite.sh | 2 +-
t/silent-custom.sh | 2 +-
t/silent-cxx.sh | 2 +-
t/silent-f77.sh | 2 +-
t/silent-f90.sh | 2 +-
t/silent-gen.sh | 2 +-
t/silent-lex.sh | 2 +-
t/silent-lt.sh | 2 +-
t/silent-many-languages.sh | 2 +-
t/silent-nested-vars.sh | 2 +-
t/silent-texi.sh | 2 +-
t/silent-yacc-headers.sh | 2 +-
t/silent-yacc.sh | 2 +-
t/sourcefile-in-subdir.sh | 2 +-
t/space.sh | 2 +-
t/specflg-dummy.sh | 2 +-
t/specflg6.sh | 2 +-
t/specflg7.sh | 2 +-
t/specflg8.sh | 2 +-
t/specflg9.sh | 2 +-
t/spell.sh | 2 +-
t/spell2.sh | 2 +-
t/spell3.sh | 2 +-
t/spelling.sh | 2 +-
t/spy-double-colon.sh | 2 +-
t/spy-rm.tap | 4 +-
t/src-acsubst.sh | 2 +-
t/stamph2.sh | 2 +-
t/stdinc.sh | 2 +-
t/stdlib.sh | 2 +-
t/stdlib2.sh | 2 +-
t/strictness-override.sh | 2 +-
t/strictness-precedence.sh | 2 +-
t/strip.sh | 2 +-
t/strip2.sh | 2 +-
t/strip3.sh | 2 +-
t/subdir-ac-subst.sh | 2 +-
t/subdir-add-pr46.sh | 2 +-
t/subdir-add2-pr46.sh | 2 +-
t/subdir-am-cond.sh | 2 +-
t/subdir-cond-err.sh | 2 +-
t/subdir-cond-gettext.sh | 2 +-
t/subdir-distclean.sh | 2 +-
t/subdir-env-interference.sh | 2 +-
t/subdir-keep-going-pr12554.sh | 2 +-
t/subdir-order.sh | 2 +-
t/subdir-subsub.sh | 2 +-
t/subdir-with-slash.sh | 2 +-
t/subdir.sh | 2 +-
t/subobj-clean-lt-pr10697.sh | 2 +-
t/subobj-clean-pr10697.sh | 2 +-
t/subobj-indir-pr13928.sh | 2 +-
t/subobj-objname-clash.sh | 2 +-
t/subobj-pr13928-more-langs.sh | 2 +-
t/subobj-vpath-pr13928.sh | 2 +-
t/subobj.sh | 2 +-
t/subobj10.sh | 2 +-
t/subobj11a.sh | 2 +-
t/subobj11b.sh | 2 +-
t/subobj11c.sh | 2 +-
t/subobj2.sh | 2 +-
t/subobj5.sh | 2 +-
t/subobj6.sh | 2 +-
t/subobj7.sh | 2 +-
t/subobj8.sh | 2 +-
t/subobj9.sh | 2 +-
t/subobjname.sh | 2 +-
t/subpkg-macrodir.sh | 2 +-
t/subpkg-yacc.sh | 2 +-
t/subpkg.sh | 2 +-
t/subpkg2.sh | 2 +-
t/subpkg3.sh | 2 +-
t/subpkg4.sh | 2 +-
t/subst-no-trailing-empty-line.sh | 2 +-
t/subst.sh | 2 +-
t/subst3.sh | 2 +-
t/subst4.sh | 2 +-
t/subst5.sh | 2 +-
t/substre2.sh | 2 +-
t/substref.sh | 2 +-
t/substtarg.sh | 2 +-
t/suffix-chain.tap | 2 +-
t/suffix-custom-pr14441.sh | 2 +-
t/suffix-custom-subobj-and-specflg.sh | 2 +-
t/suffix-custom-subobj.sh | 2 +-
t/suffix-extra-c-stuff-pr14560.sh | 2 +-
t/suffix.sh | 2 +-
t/suffix10.tap | 2 +-
t/suffix11.tap | 2 +-
t/suffix2.sh | 2 +-
t/suffix3.tap | 2 +-
t/suffix4.sh | 2 +-
t/suffix5.sh | 2 +-
t/suffix6.sh | 2 +-
t/suffix6b.sh | 2 +-
t/suffix6c.sh | 2 +-
t/suffix7.sh | 2 +-
t/suffix8.tap | 2 +-
t/suffix9.sh | 2 +-
t/symlink.sh | 2 +-
t/symlink2.sh | 2 +-
t/syntax.sh | 2 +-
t/tags-pr12372.sh | 2 +-
t/tags.sh | 2 +-
t/tags2.sh | 2 +-
t/tagsub.sh | 2 +-
t/tap-ambiguous-directive.sh | 2 +-
t/tap-autonumber.sh | 2 +-
t/tap-bad-prog.tap | 2 +-
t/tap-bailout-and-logging.sh | 2 +-
t/tap-bailout-leading-space.sh | 2 +-
t/tap-bailout-suppress-badexit.sh | 2 +-
t/tap-bailout-suppress-later-diagnostic.sh | 2 +-
t/tap-bailout-suppress-later-errors.sh | 2 +-
t/tap-bailout.sh | 2 +-
t/tap-basic.sh | 2 +-
t/tap-color.sh | 2 +-
t/tap-common-setup.sh | 2 +-
t/tap-deps.sh | 2 +-
t/tap-diagnostic-custom.sh | 2 +-
t/tap-diagnostic.sh | 2 +-
t/tap-doc.sh | 2 +-
t/tap-doc2.sh | 2 +-
t/tap-driver-stderr.sh | 2 +-
t/tap-empty-diagnostic.sh | 2 +-
t/tap-empty.sh | 2 +-
t/tap-escape-directive-2.sh | 2 +-
t/tap-escape-directive.sh | 2 +-
t/tap-exit.sh | 2 +-
t/tap-fancy.sh | 2 +-
t/tap-fancy2.sh | 2 +-
t/tap-global-log.sh | 2 +-
t/tap-global-result.sh | 2 +-
t/tap-log.sh | 2 +-
t/tap-merge-stdout-stderr.sh | 2 +-
t/tap-missing-plan-and-bad-exit.sh | 2 +-
t/tap-more.sh | 2 +-
t/tap-more2.sh | 2 +-
t/tap-msg0-bailout.sh | 2 +-
t/tap-msg0-directive.sh | 2 +-
t/tap-msg0-misc.sh | 2 +-
t/tap-msg0-planskip.sh | 2 +-
t/tap-msg0-result.sh | 2 +-
t/tap-negative-numbers.sh | 2 +-
t/tap-no-disable-hard-error.sh | 2 +-
t/tap-no-merge-stdout-stderr.sh | 2 +-
t/tap-no-spurious-numbers.sh | 2 +-
t/tap-no-spurious-summary.sh | 2 +-
t/tap-no-spurious.sh | 2 +-
t/tap-not-ok-skip.sh | 2 +-
t/tap-number-wordboundary.sh | 2 +-
t/tap-numbers-leading-zero.sh | 2 +-
t/tap-numeric-description.sh | 2 +-
t/tap-out-of-order.sh | 2 +-
t/tap-passthrough-exit.sh | 2 +-
t/tap-passthrough.sh | 2 +-
t/tap-plan-corner.sh | 2 +-
t/tap-plan-errors.sh | 2 +-
t/tap-plan-leading-zero.sh | 2 +-
t/tap-plan-malformed.sh | 2 +-
t/tap-plan-middle.sh | 2 +-
t/tap-plan-whitespace.sh | 2 +-
t/tap-plan.sh | 2 +-
t/tap-planskip-and-logging.sh | 2 +-
t/tap-planskip-badexit.sh | 2 +-
t/tap-planskip-bailout.sh | 2 +-
t/tap-planskip-case-insensitive.sh | 2 +-
t/tap-planskip-late.sh | 2 +-
t/tap-planskip-later-errors.sh | 2 +-
t/tap-planskip-unplanned-corner.sh | 2 +-
t/tap-planskip-unplanned.sh | 2 +-
t/tap-planskip-whitespace.sh | 2 +-
t/tap-planskip.sh | 2 +-
t/tap-recheck-logs.sh | 2 +-
t/tap-recheck.sh | 2 +-
t/tap-result-comment.sh | 2 +-
t/tap-signal.tap | 2 +-
t/tap-summary-color.sh | 2 +-
t/tap-summary.sh | 2 +-
t/tap-test-number-0.sh | 2 +-
t/tap-todo-skip-together.sh | 2 +-
t/tap-todo-skip-whitespace.sh | 2 +-
t/tap-todo-skip.sh | 2 +-
t/tap-unplanned.sh | 2 +-
t/tap-whitespace-normalization.sh | 2 +-
t/tap-with-and-without-number.sh | 2 +-
t/tap-xfail-tests.sh | 2 +-
t/tar-opts-errors.sh | 2 +-
t/tar-override.sh | 2 +-
t/tar-pax.sh | 2 +-
t/tar-ustar-id-too-high.sh | 2 +-
t/tar-ustar.sh | 2 +-
t/target-cflags.sh | 2 +-
t/targetclash.sh | 2 +-
t/test-driver-acsubst.sh | 2 +-
t/test-driver-cond.sh | 2 +-
t/test-driver-create-log-dir.sh | 2 +-
t/test-driver-custom-multitest-recheck.sh | 2 +-
t/test-driver-custom-multitest-recheck2.sh | 2 +-
t/test-driver-custom-multitest.sh | 2 +-
t/test-driver-custom-no-extra-driver.sh | 2 +-
t/test-driver-custom-xfail-tests.sh | 2 +-
t/test-driver-custom.sh | 2 +-
t/test-driver-fail.sh | 2 +-
t/test-driver-is-distributed.sh | 2 +-
t/test-driver-strip-vpath.sh | 2 +-
t/test-driver-trs-suffix-registered.sh | 2 +-
t/test-extensions-cond.sh | 2 +-
t/test-extensions.sh | 2 +-
t/test-harness-vpath-rewrite.sh | 2 +-
t/test-log.sh | 2 +-
t/test-logs-repeated.sh | 2 +-
t/test-metadata-global-log.sh | 2 +-
t/test-metadata-global-result.sh | 2 +-
t/test-metadata-recheck.sh | 2 +-
t/test-metadata-results.sh | 2 +-
t/test-missing.sh | 2 +-
t/test-missing2.sh | 2 +-
t/test-trs-basic.sh | 2 +-
t/test-trs-recover.sh | 2 +-
t/test-trs-recover2.sh | 2 +-
t/tests-environment-and-log-compiler.sh | 2 +-
t/tests-environment-backcompat.sh | 2 +-
t/tests-environment-fd-redirect.sh | 6 +--
t/tests-environment.sh | 2 +-
t/testsuite-summary-color.sh | 2 +-
t/testsuite-summary-count-many.sh | 2 +-
t/testsuite-summary-count.sh | 2 +-
t/testsuite-summary-reference-log.sh | 2 +-
t/transform.sh | 2 +-
t/transform2.sh | 4 +-
t/transform3.sh | 2 +-
t/txinfo-absolute-srcdir-pr408.sh | 2 +-
t/txinfo-add-missing-and-dist.sh | 2 +-
t/txinfo-bsd-make-recurs.sh | 2 +-
t/txinfo-builddir.sh | 2 +-
t/txinfo-clean.sh | 2 +-
t/txinfo-dvi-recurs.sh | 2 +-
t/txinfo-include.sh | 2 +-
t/txinfo-info-in-srcdir.sh | 2 +-
t/txinfo-makeinfo-error-no-clobber.sh | 2 +-
t/txinfo-many-output-formats-vpath.sh | 2 +-
t/txinfo-many-output-formats.sh | 2 +-
t/txinfo-no-clutter.sh | 2 +-
t/txinfo-no-extra-dist.sh | 2 +-
t/txinfo-no-installinfo.sh | 2 +-
t/txinfo-no-repeated-targets.sh | 2 +-
t/txinfo-no-split.sh | 2 +-
t/txinfo-nodist-info.sh | 2 +-
t/txinfo-other-suffixes.sh | 2 +-
t/txinfo-override-infodeps.sh | 2 +-
t/txinfo-override-texinfo-tex.sh | 2 +-
t/txinfo-setfilename-repeated.sh | 2 +-
t/txinfo-setfilename-suffix-strip.sh | 2 +-
t/txinfo-subdir-pr343.sh | 2 +-
t/txinfo-tex-dist.sh | 2 +-
t/txinfo-unrecognized-extension.sh | 2 +-
t/txinfo-unrecognized-info-suffix.sh | 2 +-
t/txinfo-vtexi.sh | 2 +-
t/txinfo-vtexi2.sh | 2 +-
t/txinfo-vtexi3.sh | 2 +-
t/txinfo-vtexi4.sh | 2 +-
t/txinfo-without-info-suffix.sh | 2 +-
t/txinfo19.sh | 2 +-
t/txinfo23.sh | 2 +-
t/txinfo24.sh | 2 +-
t/txinfo25.sh | 2 +-
t/txinfo28.sh | 2 +-
t/uninstall-fail.sh | 2 +-
t/uninstall-pr9578.sh | 2 +-
t/unused.sh | 2 +-
t/upc.sh | 2 +-
t/upc2.sh | 2 +-
t/upc3.sh | 2 +-
t/vala-configure.sh | 2 +-
t/vala-grepping.sh | 2 +-
t/vala-headers.sh | 2 +-
t/vala-libs.sh | 2 +-
t/vala-mix.sh | 2 +-
t/vala-mix2.sh | 2 +-
t/vala-non-recursive-setup.sh | 4 +-
t/vala-parallel.sh | 2 +-
t/vala-per-target-flags.sh | 2 +-
t/vala-recursive-setup.sh | 2 +-
t/vala-vapi.sh | 2 +-
t/vala-vpath.sh | 2 +-
t/var-recurs.sh | 2 +-
t/var-recurs2.sh | 2 +-
t/vars.sh | 2 +-
t/vars3.sh | 2 +-
t/vartar.sh | 2 +-
t/vartypo2.sh | 2 +-
t/vartypos.sh | 2 +-
t/version3.sh | 2 +-
t/version4.sh | 2 +-
t/version6.sh | 2 +-
t/version7.sh | 2 +-
t/version8.sh | 2 +-
t/vpath.sh | 2 +-
t/warning-groups-win-over-strictness.sh | 2 +-
t/warnings-obsolete-default.sh | 2 +-
t/warnings-override.sh | 2 +-
t/warnings-precedence.sh | 2 +-
t/warnings-strictness-interactions.sh | 2 +-
t/warnings-unknown.sh | 2 +-
t/warnings-win-over-strictness.sh | 2 +-
t/warnopts.sh | 2 +-
t/werror.sh | 2 +-
t/werror2.sh | 2 +-
t/werror3.sh | 2 +-
t/werror4.sh | 2 +-
t/whoami.sh | 2 +-
t/xsource.sh | 2 +-
t/yacc-auxdir.sh | 2 +-
t/yacc-basic.sh | 2 +-
t/yacc-bison-skeleton-cxx.sh | 2 +-
t/yacc-bison-skeleton.sh | 2 +-
t/yacc-clean-cxx.sh | 2 +-
t/yacc-clean.sh | 2 +-
t/yacc-cxx-grepping.sh | 2 +-
t/yacc-cxx.sh | 2 +-
t/yacc-d-basic.sh | 2 +-
t/yacc-d-cxx.sh | 2 +-
t/yacc-d-vpath.sh | 2 +-
t/yacc-deleted-headers.sh | 2 +-
t/yacc-depend.sh | 2 +-
t/yacc-depend2.sh | 2 +-
t/yacc-dist-nobuild-subdir.sh | 2 +-
t/yacc-dist-nobuild.sh | 2 +-
t/yacc-dry.sh | 2 +-
t/yacc-grepping.sh | 2 +-
t/yacc-grepping2.sh | 2 +-
t/yacc-headers-and-dist-pr47.sh | 2 +-
t/yacc-line.sh | 2 +-
t/yacc-misc.sh | 2 +-
t/yacc-mix-c-cxx.sh | 2 +-
t/yacc-nodist.sh | 2 +-
t/yacc-pr204.sh | 2 +-
t/yacc-subdir.sh | 2 +-
t/yacc-vpath.sh | 2 +-
t/yacc-weirdnames.sh | 2 +-
t/yflags-cmdline-override.sh | 2 +-
t/yflags-conditional.sh | 2 +-
t/yflags-cxx.sh | 2 +-
t/yflags-d-false-positives.sh | 2 +-
t/yflags-force-conditional.sh | 2 +-
t/yflags-force-override.sh | 2 +-
t/yflags-var-expand.sh | 2 +-
t/yflags.sh | 2 +-
1394 files changed, 1505 insertions(+), 1508 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index aa52f603d..fc1e911ae 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
ifeq ($(filter bootstrap,$(MAKECMDGOALS)),)
diff --git a/HACKING b/HACKING
index e34870b84..0fa3ac356 100644
--- a/HACKING
+++ b/HACKING
@@ -380,7 +380,7 @@
.
Be sure to link a version to the complete announcement (from
the version you sent to the automake list, as get archived on
- ).
+ ).
-----
@@ -397,7 +397,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program. If not, see .
+along with this program. If not, see .
Local Variables:
mode: text
diff --git a/Makefile.am b/Makefile.am
index 89de362de..b780307f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
## Might be updated later.
CLEANFILES =
diff --git a/NEWS b/NEWS
index a87f8b6ec..2eea830fa 100644
--- a/NEWS
+++ b/NEWS
@@ -356,8 +356,8 @@ New in 1.14:
compiler is an inferior one that doesn't grasp the combined use of
both the "-c -o" options; see discussion about automake bug#13378 for
more details:
-
-
+
+
- The next major Automake version (2.0) will unconditionally activate
the 'subdir-objects' option. In order to smooth out the transition,
@@ -661,7 +661,7 @@ New in 1.13:
- Support for the "Cygnus-style" trees (once enabled by the 'cygnus'
option) has been removed. See discussion about automake bug#11034
- for more background: .
+ for more background: .
- The deprecated aclocal option '--acdir' has been removed. You
should use the options '--automake-acdir' and '--system-acdir'
@@ -1632,7 +1632,7 @@ New in 1.11:
- Automake development is done in a git repository on Savannah now, see
- http://git.sv.gnu.org/gitweb/?p=automake.git
+ https://git.sv.gnu.org/gitweb/?p=automake.git
A read-only CVS mirror is provided at
@@ -3080,4 +3080,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program. If not, see .
+along with this program. If not, see .
diff --git a/PLANS/obsolete-removed/am-prog-mkdir-p.txt b/PLANS/obsolete-removed/am-prog-mkdir-p.txt
index 3fe720e41..f2fd4c8d0 100644
--- a/PLANS/obsolete-removed/am-prog-mkdir-p.txt
+++ b/PLANS/obsolete-removed/am-prog-mkdir-p.txt
@@ -18,14 +18,14 @@ Automake 1.13 -- see commit 'v1.12-20-g8a1c64f'.
Alas, it turned out the latest Gettext version at the time (0.18.1.1) was
still using that macro:
-
+
And since the maintenance of Gettext was stalled, I couldn't get a fix
committed and released in time for the appearance of Automake 1.13:
-
-
-
+
+
+
So, on strong advice by Jim Meyering, in commit 'v1.12.4-158-gdf23daf'
I re-introduced AM_PROG_MKDIR_P in Automake (thanks to Jim for having
@@ -51,7 +51,7 @@ calls), and of course, the pre-0.18.2 version of some of these files
still contains occurrences of AM_PROG_MKDIR_P -- so Automake 1.13 errors
out, and we lose. That already happened in practice:
-
+
Moreover, while I might see it as not unreasonable to ask a developer
using Automake 2.0 to also update Gettext to 1.18.2, that would not
diff --git a/PLANS/subdir-objects.txt b/PLANS/subdir-objects.txt
index c849e338e..c6a046f52 100644
--- a/PLANS/subdir-objects.txt
+++ b/PLANS/subdir-objects.txt
@@ -3,7 +3,7 @@ Summary
We want to make the behaviour currently enabled by the 'subdir-objects'
the default one, and in fact the *only* one, in Automake 2.0.
-See automake bug#13378: .
+See automake bug#13378: .
Details
-------
@@ -29,8 +29,8 @@ DONE for automake 1.13.2
The bug spotted by Nick Bowler:
-
-
+
+
and exposed in test case 't/ccnoco4.sh' has been fixed (see commit
v1.13.1-56-g34001a9). The bug was due to the fact that Automake-generated
@@ -53,7 +53,7 @@ for suggesting this).
For automake 1.16 (*before* 2.0 can be released)
------------------------------------------------
-Submit the pending patch series that fixes http://debbugs.gnu.org/13928
+Submit the pending patch series that fixes https://debbugs.gnu.org/13928
For automake 2.0
----------------
diff --git a/PLANS/texi/drop-split-info-files.txt b/PLANS/texi/drop-split-info-files.txt
index a0a5636e7..f13a32419 100644
--- a/PLANS/texi/drop-split-info-files.txt
+++ b/PLANS/texi/drop-split-info-files.txt
@@ -2,12 +2,12 @@ For in Automake 2.0 (DONE)
--------------------------
We will drop split info files in Automake 2.0.
-See automake bug#13351: .
+See automake bug#13351: .
Basically, it has been confirmed that the original reason behind
the existence of split info files was indeed "efficiency,
especially memory size":
-
+
So split info files have lost their reason d'etre on modern systems
(where even Emacs has become a lightweight program ;-). And you are
@@ -16,7 +16,7 @@ not using an embedded system to read Info documentation, right?
In addition, it appears that the use of split info files (at least
the way Automake-generated rules have been handling them for a long
time) can cause real problems in some (admittedly quite corner-case)
-situations; see automake bug#12320: .
+situations; see automake bug#12320: .
This change should be completely transparent to the developer (no
adjustments needed to be made to Makefile.am or other parts of the
diff --git a/README b/README
index fc14a7c3e..e0150b81c 100644
--- a/README
+++ b/README
@@ -25,7 +25,7 @@ information, see the file t/README.
Automake has a page on the web. See:
- http://www.gnu.org/software/automake/
+ https://www.gnu.org/software/automake/
Automake also has three mailing lists:
@@ -41,11 +41,11 @@ Automake also has three mailing lists:
and the design of new features.
To obtain more information about these list, or to subscribe to them,
-refer to
+refer to
New releases are announced to autotools-announce@gnu.org. If you want to
be informed, subscribe to that list by following the instructions at
-.
+.
For any copyright year range specified as YYYY-ZZZZ in this package,
that the range specifies every single year in that closed interval.
@@ -65,4 +65,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program. If not, see .
+along with this program. If not, see .
diff --git a/bin/aclocal.in b/bin/aclocal.in
index 87dc9d6ec..016550a49 100644
--- a/bin/aclocal.in
+++ b/bin/aclocal.in
@@ -20,7 +20,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Written by Tom Tromey , and
# Alexandre Duret-Lutz .
@@ -664,7 +664,7 @@ sub scan_file ($$$)
{
msg ('syntax', "$file:$.", "underquoted definition of $2"
. "\n run info Automake 'Extending aclocal'\n"
- . " or see http://www.gnu.org/software/automake/manual/"
+ . " or see https://www.gnu.org/software/automake/manual/"
. "automake.html#Extending-aclocal")
unless $underquoted_manual_once;
$underquoted_manual_once = 1;
@@ -768,7 +768,7 @@ sub trace_used_macros ()
# When AC_CONFIG_MACRO_DIRS is used, avoid possible spurious warnings
# from autom4te about macros being "m4_require'd but not m4_defun'd";
# for more background, see:
- # http://lists.gnu.org/archive/html/autoconf-patches/2012-11/msg00004.html
+ # https://lists.gnu.org/archive/html/autoconf-patches/2012-11/msg00004.html
# as well as autoconf commit 'v2.69-44-g1ed0548', "warn: allow aclocal
# to silence m4_require warnings".
my $early_m4_code .= "m4_define([m4_require_silent_probe], [-])";
@@ -1062,7 +1062,7 @@ Warning categories include:
Report bugs to <@PACKAGE_BUGREPORT@>.
GNU Automake home page: <@PACKAGE_URL@>.
-General help using GNU software: .
+General help using GNU software: .
EOF
exit $status;
}
diff --git a/bin/automake.in b/bin/automake.in
index 62eb13fe5..895f0b5c9 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -19,7 +19,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Originally written by David Mackenzie .
# Perl reimplementation by Tom Tromey , and
@@ -5238,7 +5238,7 @@ sub scan_autoconf_traces
{
msg 'obsolete', $where, <<'EOF';
AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated. For more info, see:
-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation
+https://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation
EOF
$package_version = $args[2];
$package_version_location = $where;
@@ -7928,7 +7928,7 @@ Library files:
print '
Report bugs to <@PACKAGE_BUGREPORT@>.
GNU Automake home page: <@PACKAGE_URL@>.
-General help using GNU software: .
+General help using GNU software: .
';
# --help always returns 0 per GNU standards.
diff --git a/bin/local.mk b/bin/local.mk
index c63f670b8..b5617f50a 100644
--- a/bin/local.mk
+++ b/bin/local.mk
@@ -11,7 +11,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## ----------------------------------- ##
## The automake and aclocal scripts. ##
diff --git a/bootstrap b/bootstrap
index 953577b05..28b1ace11 100755
--- a/bootstrap
+++ b/bootstrap
@@ -16,7 +16,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Since Automake uses itself in its build process, we can't simply run
# 'autoreconf -i' which would require Automake to already be
diff --git a/configure.ac b/configure.ac
index b10faa0b1..1aee6af27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
AC_PREREQ([2.69])
AC_INIT([GNU Automake], [1.99a], [bug-automake@gnu.org])
@@ -417,7 +417,7 @@ AC_DEFUN([_AM_SKIP_COMP_TESTS],
# more testsuite coverage "in the wild".
# Note that we don't look for the MSVC C/C++ compiler here. This is
# deliberate; for more discussion and rationale, see:
-#
+#
AC_MSG_NOTICE([will now look for generic compilers])
diff --git a/contrib/check-html.am b/contrib/check-html.am
index fc5db41ae..a12075e1b 100644
--- a/contrib/check-html.am
+++ b/contrib/check-html.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## Makefile.am fragment to produce HTML output from RST-formatted
## log files produced by the parallel-tests output.
diff --git a/contrib/multilib/README b/contrib/multilib/README
index 35c726f84..c15d2b539 100644
--- a/contrib/multilib/README
+++ b/contrib/multilib/README
@@ -5,5 +5,5 @@ For a little more information, see:
The master (and probably more up-to-date) copies of the 'config-ml.in'
and 'symlink-tree' files are maintained in the GCC development tree
-at . The same is probably true also for
+at . The same is probably true also for
the 'multi.m4' file.
diff --git a/contrib/t/help-multilib.sh b/contrib/t/help-multilib.sh
index b58ca80d1..ead697381 100755
--- a/contrib/t/help-multilib.sh
+++ b/contrib/t/help-multilib.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that our macro 'AM_ENABLE_MULTILIB' adds proper text to
# the configure help screen.
diff --git a/contrib/t/local.mk b/contrib/t/local.mk
index d55fb9583..b5e1b699b 100644
--- a/contrib/t/local.mk
+++ b/contrib/t/local.mk
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## -------------------------------- ##
## Tests for stuff in 'contrib/'. ##
diff --git a/contrib/t/multilib.sh b/contrib/t/multilib.sh
index 3899ce449..117aa93ff 100755
--- a/contrib/t/multilib.sh
+++ b/contrib/t/multilib.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check multilib support.
# Based on a test case from Ralf Corsepius.
diff --git a/contrib/t/parallel-tests-html-recursive.sh b/contrib/t/parallel-tests-html-recursive.sh
index f2d1fba08..d664b8d62 100755
--- a/contrib/t/parallel-tests-html-recursive.sh
+++ b/contrib/t/parallel-tests-html-recursive.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Recursive use of 'check-html'. See Automake bug#11287.
diff --git a/contrib/t/parallel-tests-html.sh b/contrib/t/parallel-tests-html.sh
index 4d2f8e34e..9576b6232 100755
--- a/contrib/t/parallel-tests-html.sh
+++ b/contrib/t/parallel-tests-html.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features:
# - check-html
diff --git a/contrib/tap-driver.pl b/contrib/tap-driver.pl
index 637c14c3c..d631aba91 100755
--- a/contrib/tap-driver.pl
+++ b/contrib/tap-driver.pl
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/doc/automake.texi b/doc/automake.texi
index ec95e8dac..347d74535 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -2278,7 +2278,7 @@ support new architectures and fix probes broken by changes in new
kernel versions. Each new release of Automake comes with up-to-date
copies of these programs. If your copy of Automake is getting old,
you are encouraged to fetch the latest versions of these files from
-@url{http://savannah.gnu.org/git/?group=config} before making a
+@url{https://savannah.gnu.org/git/?group=config} before making a
release.
@item depcomp
@@ -2322,7 +2322,7 @@ testsuite harness.
Not a program, this file is required for @samp{make dvi}, @samp{make
ps} and @samp{make pdf} to work when Texinfo sources are in the
package. The latest version can be downloaded from
-@url{http://www.gnu.org/software/texinfo/}.
+@url{https://www.gnu.org/software/texinfo/}.
@item ylwrap
This program wraps @command{lex} and @command{yacc} to rename their
@@ -9822,7 +9822,7 @@ a Java-based project implementing both a TAP producer and a TAP consumer.
@node DejaGnu Tests
@section DejaGnu Tests
-If @uref{ftp://ftp.gnu.org/gnu/dejagnu/, @command{dejagnu}} appears in
+If @uref{https://ftp.gnu.org/gnu/dejagnu/, @command{dejagnu}} appears in
@code{AUTOMAKE_OPTIONS}, then a @command{dejagnu}-based test suite is
assumed. The variable @code{DEJATOOL} is a list of names that are
passed, one at a time, as the @option{--tool} argument to
@@ -10405,7 +10405,7 @@ performing @ref{Automatic Rule Rewriting, , VPATH rewrites, autoconf,
The Autoconf Manual}).
Finally, Automake also emits rules to support the
-@uref{http://www.gnu.org/software/global/, GNU Global Tags program}.
+@uref{https://www.gnu.org/software/global/, GNU Global Tags program}.
The @code{GTAGS} rule runs Global Tags and puts the
result in the top build directory. The variable @code{GTAGS_ARGS}
holds arguments that are passed to @command{gtags}.
@@ -10994,7 +10994,7 @@ If the @option{--add-missing} option is given, @command{automake} will
add a generic version of the @file{INSTALL} file as well as the
@file{COPYING} file containing the text of the current version of the
GNU General Public License existing at the time of this Automake release
-(version 3 as this is written, @uref{http://www.gnu.org/@/copyleft/@/gpl.html}).
+(version 3 as this is written, @uref{https://www.gnu.org/@/copyleft/@/gpl.html}).
However, an existing @file{COPYING} file will never be overwritten by
@command{automake}.
@@ -13021,8 +13021,8 @@ To make it possible for us to fix a bug, please report it. In order to
do so effectively, it helps to know when and how to do it.
Before reporting a bug, it is a good idea to see if it is already known.
-You can look at the @uref{http://debbugs.gnu.org/, GNU Bug Tracker}
-and the @uref{http://lists.gnu.org/@/archive/@/html/@/bug-automake/,
+You can look at the @uref{https://debbugs.gnu.org/, GNU Bug Tracker}
+and the @uref{https://lists.gnu.org/@/archive/@/html/@/bug-automake/,
bug-automake mailing list archives} for previous bug reports. We
previously used a
@uref{http://sourceware.org/@/cgi-bin/@/gnatsweb.pl?database=automake,
@@ -13041,7 +13041,7 @@ features.
For a bug report, a feature request or other suggestions, please send
email to @email{@value{PACKAGE_BUGREPORT}}. This will then open a new
-bug in the @uref{http://debbugs.gnu.org/@/automake, bug tracker}. Be
+bug in the @uref{https://debbugs.gnu.org/@/automake, bug tracker}. Be
sure to include the versions of Autoconf and Automake that you use.
Ideally, post a minimal @file{Makefile.am} and @file{configure.ac} that
reproduces the problem you encounter. If you have encountered test
diff --git a/doc/help2man b/doc/help2man
index 829a8713b..f7a9c455c 100755
--- a/doc/help2man
+++ b/doc/help2man
@@ -15,10 +15,10 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see .
+# along with this program; if not, see .
# Written by Brendan O'Dea
-# Available from ftp://ftp.gnu.org/gnu/help2man/
+# Available from https://ftp.gnu.org/gnu/help2man/
use 5.008;
use strict;
@@ -759,7 +759,7 @@ sub convert_option
}
# Insert spacing escape characters \, and \/ before and after italic text. See
-# http://www.gnu.org/software/groff/manual/html_node/Ligatures-and-Kerning.html
+# https://www.gnu.org/software/groff/manual/html_node/Ligatures-and-Kerning.html
sub fix_italic_spacing
{
local $_ = shift;
diff --git a/doc/local.mk b/doc/local.mk
index 807c29308..b6742e6aa 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## ---------------- ##
## Documentation. ##
diff --git a/gen-testsuite-part b/gen-testsuite-part
index 53b5f399b..3c5fc3852 100755
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -16,7 +16,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#--------------------------------------------------------------------------
diff --git a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm
index 145ff47f0..a127b2f49 100644
--- a/lib/Automake/ChannelDefs.pm
+++ b/lib/Automake/ChannelDefs.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::ChannelDefs;
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm
index a98fb51b0..3fc4f6407 100644
--- a/lib/Automake/Channels.pm
+++ b/lib/Automake/Channels.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
###############################################################
# The main copy of this file is in Automake's git repository. #
diff --git a/lib/Automake/Condition.pm b/lib/Automake/Condition.pm
index 7955f36ab..de50e3a08 100644
--- a/lib/Automake/Condition.pm
+++ b/lib/Automake/Condition.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::Condition;
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index a22fdc0f7..4abef3dbf 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::Config;
use strict;
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
index fa20691e7..876576d49 100644
--- a/lib/Automake/Configure_ac.pm
+++ b/lib/Automake/Configure_ac.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
###############################################################
# The main copy of this file is in Automake's git repository. #
diff --git a/lib/Automake/DisjConditions.pm b/lib/Automake/DisjConditions.pm
index 2f43391c8..c15fafe9e 100644
--- a/lib/Automake/DisjConditions.pm
+++ b/lib/Automake/DisjConditions.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::DisjConditions;
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index 1a4fbc73e..8a0ed5956 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
###############################################################
# The main copy of this file is in Automake's git repository. #
diff --git a/lib/Automake/General.pm b/lib/Automake/General.pm
index e0e4c60d8..9e797bc39 100644
--- a/lib/Automake/General.pm
+++ b/lib/Automake/General.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::General;
diff --git a/lib/Automake/Getopt.pm b/lib/Automake/Getopt.pm
index 0f4d85373..af6da77ad 100644
--- a/lib/Automake/Getopt.pm
+++ b/lib/Automake/Getopt.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::Getopt;
diff --git a/lib/Automake/Item.pm b/lib/Automake/Item.pm
index f220479ed..9e561eeb7 100644
--- a/lib/Automake/Item.pm
+++ b/lib/Automake/Item.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::Item;
diff --git a/lib/Automake/ItemDef.pm b/lib/Automake/ItemDef.pm
index b6d2655c1..a01b3c1fc 100644
--- a/lib/Automake/ItemDef.pm
+++ b/lib/Automake/ItemDef.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::ItemDef;
diff --git a/lib/Automake/Language.pm b/lib/Automake/Language.pm
index bd1a555dc..58c7201ce 100644
--- a/lib/Automake/Language.pm
+++ b/lib/Automake/Language.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::Language;
diff --git a/lib/Automake/Location.pm b/lib/Automake/Location.pm
index 9aa69ded3..5b5a597b8 100644
--- a/lib/Automake/Location.pm
+++ b/lib/Automake/Location.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::Location;
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 7c215a249..2b71b8c84 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::Options;
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 58b2d4b20..37f6a2e65 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::Rule;
diff --git a/lib/Automake/RuleDef.pm b/lib/Automake/RuleDef.pm
index b8a6bda7a..b87bd6fa6 100644
--- a/lib/Automake/RuleDef.pm
+++ b/lib/Automake/RuleDef.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::RuleDef;
diff --git a/lib/Automake/VarDef.pm b/lib/Automake/VarDef.pm
index 1948ef123..5acdb729b 100644
--- a/lib/Automake/VarDef.pm
+++ b/lib/Automake/VarDef.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::VarDef;
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 3e5035824..53a111614 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::Variable;
diff --git a/lib/Automake/Version.pm b/lib/Automake/Version.pm
index 282af77de..65a6f21ec 100644
--- a/lib/Automake/Version.pm
+++ b/lib/Automake/Version.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::Version;
diff --git a/lib/Automake/Wrap.pm b/lib/Automake/Wrap.pm
index 908b06e4b..f351ef1da 100644
--- a/lib/Automake/Wrap.pm
+++ b/lib/Automake/Wrap.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
package Automake::Wrap;
diff --git a/lib/Automake/XFile.pm b/lib/Automake/XFile.pm
index a71fba8fb..bbdbd6d15 100644
--- a/lib/Automake/XFile.pm
+++ b/lib/Automake/XFile.pm
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Written by Akim Demaille .
diff --git a/lib/Automake/local.mk b/lib/Automake/local.mk
index 6763f403f..e9c426c03 100644
--- a/lib/Automake/local.mk
+++ b/lib/Automake/local.mk
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## ---------------------------------------------------- ##
## Private perl modules used by automake and aclocal. ##
diff --git a/lib/am/check.am b/lib/am/check.am
index ff174191d..9b05fc2c4 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
am__tty_colors_dummy = \
mgn= red= grn= lgn= blu= brg= std=; \
@@ -390,7 +390,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
## Be sure to exit with the proper exit status. The use of "exit 1" below
## is required to work around a FreeBSD make bug (present only when running
## in concurrent mode). See automake bug#9245:
-##
+##
## and FreeBSD PR bin/159730:
## .
$$success || exit 1
diff --git a/lib/am/check2.am b/lib/am/check2.am
index 1a1c34fe8..fbf4c7786 100644
--- a/lib/am/check2.am
+++ b/lib/am/check2.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
if %?FIRST%
## When BSD make is run in parallel mode, it apparently strips any
diff --git a/lib/am/clean-hdr.am b/lib/am/clean-hdr.am
index 9a12b6915..1de69a28b 100644
--- a/lib/am/clean-hdr.am
+++ b/lib/am/clean-hdr.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
.PHONY: distclean-hdr
distclean-am: distclean-hdr
diff --git a/lib/am/clean.am b/lib/am/clean.am
index 59d9544b0..e4a7fdb25 100644
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## We must test each macro because it might be empty, and an empty "rm
## -rf" command looks disturbing. Also, the Solaris 2.4 "rm" will
diff --git a/lib/am/compile.am b/lib/am/compile.am
index c45b04f62..c92e72d4f 100644
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
DEFAULT_INCLUDES = %DEFAULT_INCLUDES%
diff --git a/lib/am/configure.am b/lib/am/configure.am
index ec0b293ad..6f0c50883 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## This dummy rule is called from subdirectories whenever one of the
diff --git a/lib/am/data.am b/lib/am/data.am
index 6facf0acd..34b582f46 100644
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
if %?INSTALL%
include inst-vars.am
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index 04e97e2b1..4aa8f9cc2 100644
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## Name of tool to use. Default is the same as the package.
DEJATOOL = $(PACKAGE)
diff --git a/lib/am/depend.am b/lib/am/depend.am
index 8ce0cd4c7..1538036c5 100644
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
am__mv = mv -f
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index ac782d404..90dcd2a68 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## This file is read several times:
## - once per *extension* (not per language) for generic compilation rules
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 02dd06333..859c6d530 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
DIST_COMMON += $(am__DIST_COMMON)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/lib/am/footer.am b/lib/am/footer.am
index 07f538805..7291df1c8 100644
--- a/lib/am/footer.am
+++ b/lib/am/footer.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 309468491..10066b397 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
VPATH = @srcdir@
diff --git a/lib/am/header.am b/lib/am/header.am
index f2a0e9559..d4dba1285 100644
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## Exactly the same as data.am.
diff --git a/lib/am/inst-vars.am b/lib/am/inst-vars.am
index 5581f679c..2f2824522 100644
--- a/lib/am/inst-vars.am
+++ b/lib/am/inst-vars.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
if %?FIRST%
diff --git a/lib/am/install.am b/lib/am/install.am
index 5adcb52c0..6ba28e732 100644
--- a/lib/am/install.am
+++ b/lib/am/install.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## ----------------------------------------- ##
## installdirs -- Creating the installdirs. ##
diff --git a/lib/am/java.am b/lib/am/java.am
index 6398f0e6d..4f78e533d 100644
--- a/lib/am/java.am
+++ b/lib/am/java.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## ---------- ##
diff --git a/lib/am/lang-compile.am b/lib/am/lang-compile.am
index 545e0cf4e..b6c5434b5 100644
--- a/lib/am/lang-compile.am
+++ b/lib/am/lang-compile.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## This file is read once per *language*, not per extension.
diff --git a/lib/am/lex.am b/lib/am/lex.am
index c28674d11..b57bc5c90 100644
--- a/lib/am/lex.am
+++ b/lib/am/lex.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## See the comment about am__skipyacc in yacc.am.
if %?MAINTAINER-MODE%
diff --git a/lib/am/library.am b/lib/am/library.am
index 8bb1390ae..19a7f1a01 100644
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
%LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) $(EXTRA_%XLIBRARY%_DEPENDENCIES) %DIRSTAMP%
%SILENT%-rm -f %LIBRARY%
diff --git a/lib/am/libs.am b/lib/am/libs.am
index 77f91787b..377fdc552 100644
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
if %?INSTALL%
include inst-vars.am
diff --git a/lib/am/libtool.am b/lib/am/libtool.am
index a2f1ae55e..9b882d918 100644
--- a/lib/am/libtool.am
+++ b/lib/am/libtool.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
.PHONY: mostlyclean-libtool clean-libtool distclean-libtool
mostlyclean-am: mostlyclean-libtool
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 8085e3f0d..881bf3457 100644
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
if %?INSTALL%
include inst-vars.am
diff --git a/lib/am/local.mk b/lib/am/local.mk
index 270bb7347..3c2d9ba39 100644
--- a/lib/am/local.mk
+++ b/lib/am/local.mk
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## --------------------- ##
## Makefile fragments. ##
diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index 45f020327..b99f0bf0a 100644
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
if %?INSTALL%
include inst-vars.am
diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am
index ce4c1faf5..a7a2c380b 100644
--- a/lib/am/ltlibrary.am
+++ b/lib/am/ltlibrary.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
%LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) $(EXTRA_%XLTLIBRARY%_DEPENDENCIES) %DIRSTAMP%
%VERBOSE%$(%XLINK%) %RPATH% $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_LIBADD) $(LIBS)
diff --git a/lib/am/mans-vars.am b/lib/am/mans-vars.am
index 24b9e20c0..3b0f49dff 100644
--- a/lib/am/mans-vars.am
+++ b/lib/am/mans-vars.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
NROFF = nroff
## We don't really need this, but we use it in case we ever want to
diff --git a/lib/am/mans.am b/lib/am/mans.am
index 85c180821..59d9dd4a2 100644
--- a/lib/am/mans.am
+++ b/lib/am/mans.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
include inst-vars.am
man%SECTION%dir = $(mandir)/man%SECTION%
diff --git a/lib/am/program.am b/lib/am/program.am
index ba1bbb553..d2fe0e0a5 100644
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
%PROGRAM%%EXEEXT%: $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES) $(EXTRA_%XPROGRAM%_DEPENDENCIES) %DIRSTAMP%
## Remove program before linking. Otherwise the link will fail if the
diff --git a/lib/am/progs.am b/lib/am/progs.am
index 4c94b5b19..cbea73012 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## ------------ ##
## Installing. ##
diff --git a/lib/am/python.am b/lib/am/python.am
index e20f602cf..5c438d51d 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
if %?INSTALL%
include inst-vars.am
diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index dd26e4ef5..52510abdc 100644
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
%CONFIG_H%: %STAMP%
## Recover from removal of CONFIG_HEADER.
diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index 5422392af..6a9a23e56 100644
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
if %?INSTALL%
include inst-vars.am
diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index 84102493c..db681ba73 100644
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
RECURSIVE_TARGETS += all-recursive check-recursive installcheck-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
@@ -73,4 +73,3 @@ mostlyclean: mostlyclean-recursive
clean: clean-recursive
distclean: distclean-recursive
maintainer-clean: maintainer-clean-recursive
-
diff --git a/lib/am/tags.am b/lib/am/tags.am
index 7a93cde93..151402e23 100644
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index 1806c3eac..841f7d7cb 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
DIST_COMMON += %VTEXI% %STAMPVTI%
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 1a4b294e4..0a6d7b527 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%:
@@ -47,7 +47,7 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
## each file (and distinct from that of the corresponding PDF file) to
## avoid hitting a Texinfop bug that could cause low-probability racy
## failure when doing parallel builds; see:
-## http://lists.gnu.org/archive/html/automake-patches/2012-06/msg00073.html
+## https://lists.gnu.org/archive/html/automake-patches/2012-06/msg00073.html
$(TEXI2DVI) %TEXIQUIET% --build-dir=$(@:.dvi=.t2d) -o $@ %TEXIDEVNULL% \
?GENERIC? %SOURCE%
?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
@@ -66,7 +66,7 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
## each file (and distinct from that of the corresponding DVI file) to
## avoid hitting a Texinfop bug that could cause low-probability racy
## failure when doing parallel builds; see:
-## http://lists.gnu.org/archive/html/automake-patches/2012-06/msg00073.html
+## https://lists.gnu.org/archive/html/automake-patches/2012-06/msg00073.html
$(TEXI2PDF) %TEXIQUIET% --build-dir=$(@:.pdf=.t2p) -o $@ %TEXIDEVNULL% \
?GENERIC? %SOURCE%
?!GENERIC? `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 33a68f56a..a72ec1596 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## ----------- ##
## Variables. ##
@@ -159,9 +159,9 @@ install-html-am: $(HTMLS)
$(am__strip_dir) \
## This indirection is required to work around a bug of the Solaris 10
## shell /usr/xpg4/bin/sh. The description of the bug can be found at
-##
+##
## and the report of the original failure can be found at automake
-## bug#10026
+## bug#10026
d2=$$d$$p; \
if test -d "$$d2"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
diff --git a/lib/am/vala.am b/lib/am/vala.am
index 836e12e87..f20b00c2c 100644
--- a/lib/am/vala.am
+++ b/lib/am/vala.am
@@ -12,6 +12,6 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## There is no rule here. :-)
diff --git a/lib/am/yacc.am b/lib/am/yacc.am
index be1bf77a7..28f05d2de 100644
--- a/lib/am/yacc.am
+++ b/lib/am/yacc.am
@@ -12,7 +12,7 @@
## GNU General Public License for more details.
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## We want to disable the Yacc rebuild rule when
## 1. AM_MAINTAINER_MODE is used, and
diff --git a/lib/ar-lib b/lib/ar-lib
index 05094d34c..245e6f32f 100755
--- a/lib/ar-lib
+++ b/lib/ar-lib
@@ -18,7 +18,7 @@ scriptversion=2012-03-01.08; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/compile b/lib/compile
index 2ab71e4ea..f8e99f0fb 100755
--- a/lib/compile
+++ b/lib/compile
@@ -1,7 +1,7 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2017-09-16.17; # UTC
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Written by Tom Tromey .
@@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/depcomp b/lib/depcomp
index b68723213..4527c6411 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2017-09-16.17; # UTC
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
@@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/local.mk b/lib/local.mk
index 50035de60..5aae1cfb6 100644
--- a/lib/local.mk
+++ b/lib/local.mk
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## -------------------------------------------------------------------- ##
## Auxiliary scripts and files for use with "automake --add-missing". ##
diff --git a/lib/mdate-sh b/lib/mdate-sh
index f80075c04..b9db8ca59 100755
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Get modification time of a file or directory and pretty-print it.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2017-09-16.17; # UTC
# Copyright (C) 1995-2017 Free Software Foundation, Inc.
# written by Ulrich Drepper , June 1995
@@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/missing b/lib/missing
index c6e379584..46d7c7e23 100755
--- a/lib/missing
+++ b/lib/missing
@@ -1,7 +1,7 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2017-09-16.17; # UTC
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
@@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -103,7 +103,7 @@ fi
perl_URL=http://www.perl.org/
flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
diff --git a/lib/py-compile b/lib/py-compile
index 3693d96b0..b44214004 100755
--- a/lib/py-compile
+++ b/lib/py-compile
@@ -1,7 +1,7 @@
#!/bin/sh
# py-compile - Compile a Python program
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2017-09-16.17; # UTC
# Copyright (C) 2000-2017 Free Software Foundation, Inc.
@@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh
index 82efa96c0..a6219472a 100755
--- a/lib/tap-driver.sh
+++ b/lib/tap-driver.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -132,7 +132,7 @@ fi
# last `echo $?' statement), and would thus die reporting an internal
# error.
# For more information, see the Autoconf manual and the threads:
- #
+ #
#
trap : 1 3 2 13 15
if test $merge -gt 0; then
diff --git a/lib/test-driver b/lib/test-driver
index 0218a01f6..4783bd990 100755
--- a/lib/test-driver
+++ b/lib/test-driver
@@ -1,7 +1,7 @@
#! /bin/sh
# test-driver - basic testsuite driver script.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2017-09-16.17; # UTC
# Copyright (C) 2011-2017 Free Software Foundation, Inc.
#
@@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/lib/ylwrap b/lib/ylwrap
index abac60c49..4cc3adfba 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -1,7 +1,7 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2017-09-16.17; # UTC
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
@@ -18,7 +18,7 @@ scriptversion=2016-01-11.22; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/m4/init.m4 b/m4/init.m4
index 054acbac7..4c6da3e18 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -151,7 +151,7 @@ END
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: .
+that behaves properly: .
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
diff --git a/m4/local.mk b/m4/local.mk
index 287db844c..b5d751a25 100644
--- a/m4/local.mk
+++ b/m4/local.mk
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## ------------------------------ ##
## Automake-provided m4 macros. ##
diff --git a/maintainer/am-ft b/maintainer/am-ft
index 6bb7d97e5..48eb5ba54 100755
--- a/maintainer/am-ft
+++ b/maintainer/am-ft
@@ -15,7 +15,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# TODO: some documentation would be nice ...
diff --git a/maintainer/am-xft b/maintainer/am-xft
index 98263babb..958a21a96 100755
--- a/maintainer/am-xft
+++ b/maintainer/am-xft
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
MAKE=${MAKE-make} GIT=${GIT-git}
$GIT clean -fdx && $MAKE bootstrap && $MAKE dist && exec am-ft "$@"
diff --git a/maintainer/check-perl-protos b/maintainer/check-perl-protos
index b1d6a72b5..649aafb34 100755
--- a/maintainer/check-perl-protos
+++ b/maintainer/check-perl-protos
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
use warnings;
use strict;
diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index 1cfd2e870..51907193c 100644
--- a/maintainer/maint.mk
+++ b/maintainer/maint.mk
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Avoid CDPATH issues.
unexport CDPATH
@@ -286,7 +286,7 @@ announcement: NEWS
$(AM_V_GEN): \
&& rm -f $@ $@-t \
&& $(determine_release_type) \
- && ftp_base="ftp://$$dest.gnu.org/gnu/$(PACKAGE)" \
+ && ftp_base="https://$$dest.gnu.org/gnu/$(PACKAGE)" \
&& X () { printf '%s\n' "$$*" >> $@-t; } \
&& X "We are pleased to announce the $(PACKAGE_NAME) $(VERSION)" \
"$$announcement_type." \
@@ -502,7 +502,7 @@ update-copyright:
# Run the testsuite with the least supported autoconf version. #
# -------------------------------------------------------------- #
-gnu-ftp = http://ftp.gnu.org/gnu
+gnu-ftp = https://ftp.gnu.org/gnu
# Various shorthands: version, name, package name, tarball name,
# tarball location, installation directory.
diff --git a/maintainer/rename-tests b/maintainer/rename-tests
index 8c643872b..b933016f3 100755
--- a/maintainer/rename-tests
+++ b/maintainer/rename-tests
@@ -14,7 +14,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
set -e -u
diff --git a/maintainer/syntax-checks.mk b/maintainer/syntax-checks.mk
index 699203ad8..7223eca6b 100644
--- a/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# We also have to take into account VPATH builds (where some generated
# tests might be in '$(builddir)' rather than in '$(srcdir)'), TAP-based
diff --git a/old/ChangeLog.03 b/old/ChangeLog.03
index 77c4ecbe3..75128f14a 100644
--- a/old/ChangeLog.03
+++ b/old/ChangeLog.03
@@ -777,7 +777,7 @@
* lib/Automake/XFile.pm: Use Errno.
(lock): Ignore ENOLCK errors. Problem reported Andreas Schwab in
- .
+ .
2003-09-30 Tom Tromey
@@ -1743,7 +1743,7 @@
* lib/install-sh (dsttmp, rmtmp): Do not use '#' in file names;
it's not guaranteed by POSIX and it doesn't work on OpenVMS.
Bug reported by Bernard Giroud in:
- http://mail.gnu.org/archive/html/autoconf-patches/2003-06/msg00013.html
+ https://mail.gnu.org/archive/html/autoconf-patches/2003-06/msg00013.html
2003-06-05 Alexandre Duret-Lutz
diff --git a/old/ChangeLog.04 b/old/ChangeLog.04
index 0bbd2b028..2220adbad 100644
--- a/old/ChangeLog.04
+++ b/old/ChangeLog.04
@@ -147,7 +147,7 @@
* lib/mdate-sh: Don't use "set - x`$ls_command /`", as zsh mishandles
the spaces inside $ls_command. Problem reported by Loulou Pouchet in
- .
+ .
Don't use "set - x"; plain "set x" is enough, and simplifies debugging.
2004-12-05 Toshio Kuratomi
diff --git a/old/ChangeLog.09 b/old/ChangeLog.09
index 748bfcb81..601550d85 100644
--- a/old/ChangeLog.09
+++ b/old/ChangeLog.09
@@ -3559,7 +3559,7 @@
* tests/output13.test: New test.
* tests/Makefile.am: Adjust.
Prompted by report from Bruno Haible in
- .
+ .
Fix signal handling in aclocal.
* aclocal.in (unlink_tmp): If invoked by a signal, note so
@@ -3801,7 +3801,7 @@
* tests/missing4.test: Adjust.
* NEWS: Update.
Problem reported by Bruno Haible in
- .
+ .
2007-05-03 Stepan Kasal
@@ -3917,7 +3917,7 @@
* lib/install-sh: Implement install-sh -C.
(This patch is the remaining part of the patch proposed in
- .)
+ .)
(usage): Document it.
(copy_on_change): New var.
* tests/defs.in (is_younger): New function.
@@ -3934,7 +3934,7 @@
Simplify install-sh and its test. This shouldn't change any behavior.
(This patch is a subset of the patch proposed in
- .)
+ .)
* lib/install-sh (usage): Use usual GNU style.
(dstarg): Rename as...
(dst_arg): this for consistency.
@@ -4131,7 +4131,7 @@
equivalent of "chmod 777 /" or "chmod 0 /" on a buggy FreeBSD
system. We hope this is rare in practice, but it's clearly worth
fixing. Problem reported by Alex Unleashed in
- .
+ .
Also, don't bother to check for -m bugs unless we're using -m;
suggested by Stepan Kasal.
@@ -4393,7 +4393,7 @@
likely to work with older operating systems since Automake uses
octal modes, and also works around a bug with HP-UX 11.23
'mkdir -p -m u=rwx,g=rx,o=rx,u+wx' reported by Ralf Wildenhues in
- .
+ .
(cp_umask, mkdir_umask): New variables, to avoid
temporarily creating files or directories with too-permissive modes.
(mkdir_mode): Use the FreeBSD 'install' method for computing modes of
@@ -4412,7 +4412,7 @@
* tests/defs.in (AUTOMAKE_run): Redirect stdout before stderr,
for consistency with the recommendation prompted by this report:
- .
+ .
2006-06-24 Stepan Kasal
Ralf Wildenhues
diff --git a/old/ChangeLog.11 b/old/ChangeLog.11
index f7ec2c5e1..6b01cec1f 100644
--- a/old/ChangeLog.11
+++ b/old/ChangeLog.11
@@ -21,7 +21,7 @@
regex: remove obsolete macro AM_WITH_REGEX
Today, practically nobody uses the GNU rx library, which, according
- to its own website , has
+ to its own website , has
been "decommissioned". Consequently, the automake-provided macro
AM_WITH_REGEX is not used nor required anymore.
* m4/regex.m4: Delete.
@@ -98,7 +98,7 @@
We have actually verified that the new version of the test case
catches the Automake 1.7 it is intended to check against, using
the Automake 1.7.9 tarball downloaded from:
-
+
Reported by Jim Meyering in automake bug#10374.
2011-12-27 Stefano Lattarini
@@ -396,7 +396,7 @@
* tests/libtool-macros.test: Likewise.
See also:
-
+
2011-12-22 Stefano Lattarini
@@ -443,7 +443,7 @@
regex: deprecate the obsolete macro AM_WITH_REGEX
This is a backport of commit v1.11-433-g37b0aee.
Today, practically nobody uses the GNU rx library, which, according
- to its own website , has
+ to its own website , has
been "decommissioned". Consequently, the automake-provided macro
AM_WITH_REGEX is not used nor required anymore. Deprecate it, so
that it will be possible to safely remove it in the next major
@@ -458,7 +458,7 @@
* tests/Makefile.am (TESTS): Add it.
* NEWS: Update.
See also:
-
+
2011-12-22 Stefano Lattarini
@@ -767,7 +767,7 @@
($AUTOHEADER, $AUTORECONF): Likewise, but for autoheader and
autoreconf respectively.
Reported by Bruno Haible:
-
+
2011-12-16 Stefano Lattarini
@@ -964,7 +964,7 @@
spurious failures experienced when cross-compiling.
From a report by Jim Meyering:
-
+
* tests/cond35.test: Provide a dummy `yywrap' function.
* tests/lex3.test: Likewise.
@@ -1033,8 +1033,8 @@
* lib/am/texinfos.am (install-html-am): Use an extra variable
indirection to work around a bug in Solaris 10 /usr/xpg4/bin/sh.
Bug revealed by a failure of `txinfo21.test'. See also:
-
-
+
+
2011-11-17 Stefano Lattarini
@@ -1663,7 +1663,7 @@
spurious failures experienced when cross-compiling.
Reported by Jim Meyering:
-
+
* tests/cond35.test: Provide a dummy `yywrap' function.
* tests/lex3.test: Likewise.
@@ -2395,7 +2395,7 @@
signal is trapped, since trying to do it portably within the shell
means opening a nasty can of worms.
For more information and background, see:
-
+
@@ -3562,7 +3562,7 @@
make was run in concurrent mode (as in, e.g., "make -j2
check"). The bug is not present in NetBSD make.
This change fixes automake bug#9245:
-
+
See also FreeBSD PR bin/159730:
* lib/am/check.am [%?PARALLEL_TESTS%] $(TEST_SUITE_LOG): Use a
@@ -5286,8 +5286,8 @@
simple tests: support developer-defined fd redirections
Motivated by coreutils bug#8846, and related discussions:
-
-
+
+
In those threads it has been shown how problematic it can be to do
portable file descriptor redirections in the testsuite when using
the Automake testsuite harness. This change should remedy to that
@@ -5541,7 +5541,7 @@
This change introduces a new special `:test-result:' "END", that,
when seen, prevents the rest of the log file from being parsed.
For more information, refer to the thread:
-
+
* lib/am/check.am ($(TEST_SUITE_LOG)): Stop the parsing of a log
file as soon as the special ":test-result:END" directive is seen.
Related changes and enhancements.
@@ -6178,9 +6178,9 @@
* tests/tests-environment-fd-redirect.test: New test.
* tests/Makefile.am (TESTS): Update.
Motivated by coreutils bug#8846:
-
+
See also following CC:ed thread on bug-autoconf list:
-
+
2011-06-16 Stefano Lattarini
@@ -6215,9 +6215,9 @@
Based on commit v8.12-82-g6b68745 "tests: accommodate HP-UX and
ksh-derived shells" in GNU coreutils.
Further references, with lots of discussion:
-
+
-
+
2011-06-13 Stefano Lattarini
@@ -6478,7 +6478,7 @@
The described spurious failures have already occurred in practice,
for examples on Solaris systems which also had GNU Bash installed.
From a suggestion by Peter Rosin. See discussion at:
-
+
* tests/defs (xsi-shell): Now check that $SHELL, rather than the
shell currently running the test script, is an XSI shell.
(xsi-bin-sh): New requirement, checking that /bin/sh (which can
@@ -6772,7 +6772,7 @@
caused inconsistencies in the test suite, brining to spurious
failures.
Problem reported by Graham Reitz on the automake list; see thread:
-
+
* automake.in ($traces): Use `@am_AUTOCONF', not simply `autoconf'.
* aclocal.in ($traces): Use `@am_AUTOM4TE', not simply `autom4te'.
* Makefile.am (do_subst): Substitute also `@am_AUTOCONF' and
@@ -8180,7 +8180,7 @@
check: new developer-reserved AM_TESTS_SETUP variable
For reference, see the discussion at:
-
+
* lib/am/check.am [%?PARALLEL_TESTS%] (am__check_pre): Pass also
$(AM_TESTS_SETUP). Comments updated, and some typos fixed.
* doc/automake.texi (Simple Tests using parallel-tests): Document
@@ -10051,7 +10051,7 @@
the $(TEST_LOG_COMPILER).
For more information, please refer to the thread "Fix parallel
testsuite run with zsh" on automake-patches, dated 2010-12-22:
-
+
This change works around the problems described above for Zsh 4.3
or later, and offers better error messages (instead of random
failures) for earlier Zsh version.
@@ -10088,9 +10088,9 @@
implementations with limited (broken?) `-k' support; for more
information, see these subthreads on the automake-patches list:
- 2010-11-15, "Testsuite failures on HP-UX 11.23",
-
+
- 2010-11-15, "Testsuite failures on IRIX 6.5",
-
+
2010-12-21 Stefano Lattarini
diff --git a/old/TODO b/old/TODO
index 00c0346ba..50460a941 100644
--- a/old/TODO
+++ b/old/TODO
@@ -266,7 +266,7 @@ distribution. Also allow "html_DATA", for raw .html files.
[ when will texinfo directly support html? ]
See also Karl Berry's message on a roadmap for a "info -> html"
transition:
-
+
uninstall and pkg-dirs should rm -rf the dir.
@@ -400,7 +400,7 @@ with all the different package utilities somehow. Lately I've been
hearing good things about the RedHat packaging utilities. Why are
there so many of these? Are they fun to write or something?
The RedHat package utility is called RPM; see
- ftp://ftp.redhat.com/pub/code/rpm
+ http://rpm.org/
It actually has problems, like no configure script and no documentation.
For Cygnus it would probably be good to be able to handle the native
@@ -496,7 +496,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program. If not, see .
+along with this program. If not, see .
Local Variables:
diff --git a/pre-inst-env.in b/pre-inst-env.in
index f285ca62c..3f895075f 100644
--- a/pre-inst-env.in
+++ b/pre-inst-env.in
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
abs_top_srcdir="@abs_top_srcdir@"
abs_top_builddir="@abs_top_builddir@"
diff --git a/t/CheckListOfTests.am b/t/CheckListOfTests.am
index ca29b4762..b741a2176 100644
--- a/t/CheckListOfTests.am
+++ b/t/CheckListOfTests.am
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
##
## Temporary files used in the 'check-list-of-tests' recipe.
diff --git a/t/ac-output-old.tap b/t/ac-output-old.tap
index d5e17ab78..2022681b5 100644
--- a/t/ac-output-old.tap
+++ b/t/ac-output-old.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for various older bugs related to quoting, escaping and
# line breaking in the use of AC_OUTPUT. Synthesised by a bunch
diff --git a/t/aclocal-I-and-install.sh b/t/aclocal-I-and-install.sh
index d906de7d7..33f7bb15b 100644
--- a/t/aclocal-I-and-install.sh
+++ b/t/aclocal-I-and-install.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure aclocal define macros in the same order as -I's.
# This is the similar to aclocal-I-order-1.sh, with the macro calls
diff --git a/t/aclocal-I-order-1.sh b/t/aclocal-I-order-1.sh
index 46263ccfe..c844079c4 100644
--- a/t/aclocal-I-order-1.sh
+++ b/t/aclocal-I-order-1.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure aclocal define macros in the same order as -I's.
diff --git a/t/aclocal-I-order-2.sh b/t/aclocal-I-order-2.sh
index b6790e472..096b4fdb6 100644
--- a/t/aclocal-I-order-2.sh
+++ b/t/aclocal-I-order-2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that when two files define the same macro in the same
# directory, the macro from the lexically greatest file is used.
diff --git a/t/aclocal-I-order-3.sh b/t/aclocal-I-order-3.sh
index a5d0d8fbc..c0a5f6d7d 100644
--- a/t/aclocal-I-order-3.sh
+++ b/t/aclocal-I-order-3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that when two files define the same macro in the same
# directory, the macro from the lexically greatest file is used.
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh
index 2016b95c4..6d5ac9c66 100644
--- a/t/aclocal-acdir.sh
+++ b/t/aclocal-acdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test aclocal's '--automake-acdir' and '--system-acdir' options. Also
# check that stuff in the system acdir takes precedence over stuff in
diff --git a/t/aclocal-amflags.sh b/t/aclocal-amflags.sh
index fe1c08717..2979b2043 100644
--- a/t/aclocal-amflags.sh
+++ b/t/aclocal-amflags.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the obsolescent idiom of setting $(ACLOCAL_AMFLAGS) in
# Makefile.am is warned against, but still works. Remove this test
diff --git a/t/aclocal-autoconf-version-check.sh b/t/aclocal-autoconf-version-check.sh
index 0709de003..00f68b02b 100644
--- a/t/aclocal-autoconf-version-check.sh
+++ b/t/aclocal-autoconf-version-check.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure autoconf version checks in aclocal.m4 are robust.
diff --git a/t/aclocal-comments-respected.sh b/t/aclocal-comments-respected.sh
index 41c12a9cf..364bb82ca 100644
--- a/t/aclocal-comments-respected.sh
+++ b/t/aclocal-comments-respected.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure aclocal ignores include() commands in comments.
# Report from Mike Frysinger.
diff --git a/t/aclocal-deleted-header-aclocal-amflags.sh b/t/aclocal-deleted-header-aclocal-amflags.sh
index 306141cb1..c161b52ff 100644
--- a/t/aclocal-deleted-header-aclocal-amflags.sh
+++ b/t/aclocal-deleted-header-aclocal-amflags.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure the "deleted header file" issue is fixed wrt. aclocal.m4
# dependencies.
diff --git a/t/aclocal-deleted-header.sh b/t/aclocal-deleted-header.sh
index 918f92951..c33f461b5 100644
--- a/t/aclocal-deleted-header.sh
+++ b/t/aclocal-deleted-header.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure the "deleted header file" issue is fixed w.r.t. aclocal.m4
# dependencies. See also related the tests 'remake-deleted-m4-file.sh'
diff --git a/t/aclocal-deps-subdir.sh b/t/aclocal-deps-subdir.sh
index ec53bf91c..77ec5a460 100644
--- a/t/aclocal-deps-subdir.sh
+++ b/t/aclocal-deps-subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that aclocal.m4's dependencies are honored in
# sub-directories. See also related tests 'remake-subdir*.sh'.
diff --git a/t/aclocal-deps.sh b/t/aclocal-deps.sh
index edb5beeed..18adc213c 100644
--- a/t/aclocal-deps.sh
+++ b/t/aclocal-deps.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure dependencies on aclocal.m4 are set correctly.
# Report from Jim Meyering.
diff --git a/t/aclocal-dirlist-abspath.sh b/t/aclocal-dirlist-abspath.sh
index 9e1f0416f..ec65299c5 100644
--- a/t/aclocal-dirlist-abspath.sh
+++ b/t/aclocal-dirlist-abspath.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check use of absolute paths in dirlist.
diff --git a/t/aclocal-dirlist-globbing.sh b/t/aclocal-dirlist-globbing.sh
index 0451efcea..9479ea55f 100644
--- a/t/aclocal-dirlist-globbing.sh
+++ b/t/aclocal-dirlist-globbing.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check dirlist globbing support.
diff --git a/t/aclocal-dirlist.sh b/t/aclocal-dirlist.sh
index e3cc1eaee..ec933da11 100644
--- a/t/aclocal-dirlist.sh
+++ b/t/aclocal-dirlist.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check dirlist support.
diff --git a/t/aclocal-install-absdir.sh b/t/aclocal-install-absdir.sh
index 973d7421f..c71935f41 100644
--- a/t/aclocal-install-absdir.sh
+++ b/t/aclocal-install-absdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure "aclocal --install" install files also in directories
# passed to '-I' as absolute paths. Now that we support the
diff --git a/t/aclocal-install-fail.sh b/t/aclocal-install-fail.sh
index d9651ca0f..ac6810681 100644
--- a/t/aclocal-install-fail.sh
+++ b/t/aclocal-install-fail.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that "aclocal --install" fails when it should.
# FIXME: this is a good candidate for a conversion to TAP.
diff --git a/t/aclocal-install-mkdir.sh b/t/aclocal-install-mkdir.sh
index 556cff6c3..24f1da71c 100644
--- a/t/aclocal-install-mkdir.sh
+++ b/t/aclocal-install-mkdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that "aclocal --install" creates the local m4 directory if
# necessary.
diff --git a/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
index db46e5c25..5d21090fe 100644
--- a/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
+++ b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure m4_included files are also scanned for definitions.
# Report from Phil Edwards.
diff --git a/t/aclocal-m4-include-are-scanned.sh b/t/aclocal-m4-include-are-scanned.sh
index 96e70b90b..0d340f6b8 100644
--- a/t/aclocal-m4-include-are-scanned.sh
+++ b/t/aclocal-m4-include-are-scanned.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure m4_included files are also scanned for definitions.
# Report from Phil Edwards.
diff --git a/t/aclocal-m4-sinclude.sh b/t/aclocal-m4-sinclude.sh
index 507230fb2..f4c850e67 100644
--- a/t/aclocal-m4-sinclude.sh
+++ b/t/aclocal-m4-sinclude.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure changes to m4_included files also cause aclocal.m4 to change.
diff --git a/t/aclocal-macrodir.tap b/t/aclocal-macrodir.tap
index 877dccd4f..823268423 100644
--- a/t/aclocal-macrodir.tap
+++ b/t/aclocal-macrodir.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Several tests on the use of the m4 macro AC_CONFIG_MACRO_DIR with
# aclocal. See also related test 'aclocal-macrodir.tap'.
diff --git a/t/aclocal-macrodirs.tap b/t/aclocal-macrodirs.tap
index b43410a84..b6bb946bd 100644
--- a/t/aclocal-macrodirs.tap
+++ b/t/aclocal-macrodirs.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Several tests on the use of the m4 macro AC_CONFIG_MACRO_DIRS with
# aclocal. See also related test 'aclocal-macrodir.tap'.
diff --git a/t/aclocal-missing-macros.sh b/t/aclocal-missing-macros.sh
index 92fde75f7..4bc00986a 100644
--- a/t/aclocal-missing-macros.sh
+++ b/t/aclocal-missing-macros.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure include of include detects missing macros
diff --git a/t/aclocal-no-extra-scan.sh b/t/aclocal-no-extra-scan.sh
index eb629f04e..91f93aed0 100644
--- a/t/aclocal-no-extra-scan.sh
+++ b/t/aclocal-no-extra-scan.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure aclocal does not include definitions that are not actually
# evaluated.
diff --git a/t/aclocal-no-force.sh b/t/aclocal-no-force.sh
index 4c15d0191..e0d558221 100644
--- a/t/aclocal-no-force.sh
+++ b/t/aclocal-no-force.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure aclocal does not overwrite aclocal.m4 needlessly.
# Also make sure automake --no-force does not overwrite Makefile.in needlessly.
diff --git a/t/aclocal-no-install-no-mkdir.sh b/t/aclocal-no-install-no-mkdir.sh
index bbcf624f6..51c99305c 100644
--- a/t/aclocal-no-install-no-mkdir.sh
+++ b/t/aclocal-no-install-no-mkdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that aclocal does not create a non-existent local m4 directory
# if the '--install' option is not given.
diff --git a/t/aclocal-no-symlinked-overwrite.sh b/t/aclocal-no-symlinked-overwrite.sh
index c0f0140dd..d0450aa57 100644
--- a/t/aclocal-no-symlinked-overwrite.sh
+++ b/t/aclocal-no-symlinked-overwrite.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure aclocal does not write into symlinked aclocal.m4.
diff --git a/t/aclocal-no-unused-required.sh b/t/aclocal-no-unused-required.sh
index eb8ae39f9..cdac63d2e 100644
--- a/t/aclocal-no-unused-required.sh
+++ b/t/aclocal-no-unused-required.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure aclocal does not require unused macros.
diff --git a/t/aclocal-path-install-serial.sh b/t/aclocal-path-install-serial.sh
index ccbdb16ce..5ebcb1b58 100644
--- a/t/aclocal-path-install-serial.sh
+++ b/t/aclocal-path-install-serial.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# ACLOCAL_PATH, acdir and '--install' interactions when serial number
# are involved.
diff --git a/t/aclocal-path-install.sh b/t/aclocal-path-install.sh
index 6b5815032..3ff7d4196 100644
--- a/t/aclocal-path-install.sh
+++ b/t/aclocal-path-install.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# ACLOCAL_PATH and '--install' interactions.
diff --git a/t/aclocal-path-nonexistent.sh b/t/aclocal-path-nonexistent.sh
index 88451b28d..caf365873 100644
--- a/t/aclocal-path-nonexistent.sh
+++ b/t/aclocal-path-nonexistent.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Non-existent directories in ACLOCAL_PATH are ok.
diff --git a/t/aclocal-path-precedence.sh b/t/aclocal-path-precedence.sh
index 1f8a1183d..a96cd86f0 100644
--- a/t/aclocal-path-precedence.sh
+++ b/t/aclocal-path-precedence.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check precedence rules for ACLOCAL_PATH.
diff --git a/t/aclocal-path.sh b/t/aclocal-path.sh
index d10b30a83..cbaa4ac3c 100644
--- a/t/aclocal-path.sh
+++ b/t/aclocal-path.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check basic ACLOCAL_PATH support.
diff --git a/t/aclocal-pr450.sh b/t/aclocal-pr450.sh
index 7c52de56a..4c9d22f43 100644
--- a/t/aclocal-pr450.sh
+++ b/t/aclocal-pr450.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure aclocal does not fail on configure.ac inclusions that do
# more than just variable definitions.
diff --git a/t/aclocal-print-acdir.sh b/t/aclocal-print-acdir.sh
index c6fa41450..abaee0afc 100644
--- a/t/aclocal-print-acdir.sh
+++ b/t/aclocal-print-acdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test on aclocal's '--print-ac-dir' option.
diff --git a/t/aclocal-remake-misc.sh b/t/aclocal-remake-misc.sh
index c1f01dd13..fe7385f8d 100644
--- a/t/aclocal-remake-misc.sh
+++ b/t/aclocal-remake-misc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure aclocal.m4 is rebuilt whenever a configure
# dependency changes. Test for acinclude.m4 and VPATH too.
diff --git a/t/aclocal-req.sh b/t/aclocal-req.sh
index 92cf333b8..dd46a85a6 100644
--- a/t/aclocal-req.sh
+++ b/t/aclocal-req.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure macro used in m4 file is included.
diff --git a/t/aclocal-scan-configure-ac-pr319.sh b/t/aclocal-scan-configure-ac-pr319.sh
index 8de0897e7..2e7e10080 100644
--- a/t/aclocal-scan-configure-ac-pr319.sh
+++ b/t/aclocal-scan-configure-ac-pr319.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure aclocal scans configure.ac for macro definitions.
# PR/319.
diff --git a/t/aclocal-serial.sh b/t/aclocal-serial.sh
index e256cd020..17ed7d359 100644
--- a/t/aclocal-serial.sh
+++ b/t/aclocal-serial.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for --install with #serial numbers.
diff --git a/t/aclocal-underquoted-defun.sh b/t/aclocal-underquoted-defun.sh
index 2f07c03e9..2770011c5 100644
--- a/t/aclocal-underquoted-defun.sh
+++ b/t/aclocal-underquoted-defun.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure we diagnose underquoted AC_DEFUN's.
diff --git a/t/aclocal-verbose-install.sh b/t/aclocal-verbose-install.sh
index de6ea9139..bcbbcfa6b 100644
--- a/t/aclocal-verbose-install.sh
+++ b/t/aclocal-verbose-install.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check verbose messages by 'aclocal --install'.
diff --git a/t/aclocal.sh b/t/aclocal.sh
index 64e1aa847..171a179e3 100644
--- a/t/aclocal.sh
+++ b/t/aclocal.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test on some aclocal options. Report from Alexandre Oliva.
diff --git a/t/acsilent.sh b/t/acsilent.sh
index 215763055..cae24ba59 100644
--- a/t/acsilent.sh
+++ b/t/acsilent.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure there are no spurious acinclude warnings.
diff --git a/t/acsubst.sh b/t/acsubst.sh
index c05e890b1..3ebc5ed5f 100644
--- a/t/acsubst.sh
+++ b/t/acsubst.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
. test-init.sh
diff --git a/t/acsubst2.sh b/t/acsubst2.sh
index 60ccf29ba..fd5d62841 100644
--- a/t/acsubst2.sh
+++ b/t/acsubst2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
. test-init.sh
diff --git a/t/add-missing-install-sh.sh b/t/add-missing-install-sh.sh
index ba21c87d3..12ba626e6 100644
--- a/t/add-missing-install-sh.sh
+++ b/t/add-missing-install-sh.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for this bug:
# automake: Makefile.am: required file "../../install-sh" not found; installing
diff --git a/t/add-missing-multiple.sh b/t/add-missing-multiple.sh
index 5f0772b1d..7d8e7b9b6 100644
--- a/t/add-missing-multiple.sh
+++ b/t/add-missing-multiple.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure Automake will install several copies of required files if needed.
# Reported by Marius Vollmer.
diff --git a/t/add-missing.tap b/t/add-missing.tap
index 512602c7d..4276f3fb1 100644
--- a/t/add-missing.tap
+++ b/t/add-missing.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that automake complains when required auxiliary files are not
# found, and that 'automake --add-missing' installs the files (and only
diff --git a/t/all.sh b/t/all.sh
index 70b1abf38..bb908940f 100644
--- a/t/all.sh
+++ b/t/all.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure several *-local's in a single rule work.
diff --git a/t/all2.sh b/t/all2.sh
index d80b62b3c..a24e16cdc 100644
--- a/t/all2.sh
+++ b/t/all2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure all-local and other -local targets work correctly.
diff --git a/t/alloca.sh b/t/alloca.sh
index b56ce89c9..f5d654bdc 100644
--- a/t/alloca.sh
+++ b/t/alloca.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we complain if @ALLOCA@ is used without being set in configure.ac
diff --git a/t/alloca2.sh b/t/alloca2.sh
index 8be2c56b0..cf05f9632 100644
--- a/t/alloca2.sh
+++ b/t/alloca2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we complain if @LTALLOCA@ is used without being set in configure.ac
diff --git a/t/alpha.sh b/t/alpha.sh
index 35df26e88..9fb704b59 100644
--- a/t/alpha.sh
+++ b/t/alpha.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure README-alpha is distributed when appropriate. Report from
# Jim Meyering.
diff --git a/t/alpha2.sh b/t/alpha2.sh
index 0f3fb1702..ca7d0177a 100644
--- a/t/alpha2.sh
+++ b/t/alpha2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Another check for README-alpha support. This time it is requested
# from configure.ac. Report from Akim Demaille.
diff --git a/t/am-config-header.sh b/t/am-config-header.sh
index 945cf237c..af7d6226f 100644
--- a/t/am-config-header.sh
+++ b/t/am-config-header.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the obsolete macro AM_CONFIG_HEADER still works.
diff --git a/t/am-default-source-ext.sh b/t/am-default-source-ext.sh
index d42193d85..082c7a1fb 100644
--- a/t/am-default-source-ext.sh
+++ b/t/am-default-source-ext.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# AM_DEFAULT_SOURCE_EXT
diff --git a/t/am-include-only-one-generated-fragment.sh b/t/am-include-only-one-generated-fragment.sh
index f0c6834e4..99c8cb85a 100644
--- a/t/am-include-only-one-generated-fragment.sh
+++ b/t/am-include-only-one-generated-fragment.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that inclusion of only one '.am' that can be regenerated via
# a user-defined Makefile rule does not incur in spurious automake
diff --git a/t/am-macro-not-found.sh b/t/am-macro-not-found.sh
index aed653563..e5480d992 100644
--- a/t/am-macro-not-found.sh
+++ b/t/am-macro-not-found.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to see if aclocal correctly reports missing AM_ macro.
diff --git a/t/am-missing-prog.sh b/t/am-missing-prog.sh
index b76b8f3b0..59a61b24d 100644
--- a/t/am-missing-prog.sh
+++ b/t/am-missing-prog.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test AM_MISSING_PROG.
diff --git a/t/am-prog-cc-c-o.sh b/t/am-prog-cc-c-o.sh
index b5439c83f..74e973214 100644
--- a/t/am-prog-cc-c-o.sh
+++ b/t/am-prog-cc-c-o.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that uses of the obsolescent AM_PROG_CC_C_O macro doesn't
# cause spurious warnings or errors. Suggested by Eric Blake.
diff --git a/t/am-prog-cc-stdc.sh b/t/am-prog-cc-stdc.sh
index 6f9903fa4..4f01f70ec 100644
--- a/t/am-prog-cc-stdc.sh
+++ b/t/am-prog-cc-stdc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the obsolete macro the obsolete macro AM_PROG_CC_STDC
# still works.
diff --git a/t/am-prog-mkdir-p.sh b/t/am-prog-mkdir-p.sh
index 477148aab..a99dd5aa2 100644
--- a/t/am-prog-mkdir-p.sh
+++ b/t/am-prog-mkdir-p.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the AM_PROG_MKDIR_P macro is deprecated, but still works.
# We should should also still define $(mkdir_p), for backward
diff --git a/t/am-tests-environment.sh b/t/am-tests-environment.sh
index d29c99577..1e900ae02 100644
--- a/t/am-tests-environment.sh
+++ b/t/am-tests-environment.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# parallel-tests: check AM_TESTS_ENVIRONMENT support, and its
# interactions with TESTS_ENVIRONMENT.
diff --git a/t/amassign.sh b/t/amassign.sh
index 9d89101ed..76c2c58b0 100644
--- a/t/amassign.sh
+++ b/t/amassign.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to see if AM_ name can be assigned to in configure.ac.
# Report from Steve Robbins.
diff --git a/t/amhello-binpkg.sh b/t/amhello-binpkg.sh
index 5f2501ca9..7f4ad58d7 100644
--- a/t/amhello-binpkg.sh
+++ b/t/amhello-binpkg.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test an example from the manual about the 'amhello' package:
# using DESTDIR to build simple, no-frills binary packages.
diff --git a/t/amhello-cflags.sh b/t/amhello-cflags.sh
index 9d1cfc757..a5bc7dbfd 100644
--- a/t/amhello-cflags.sh
+++ b/t/amhello-cflags.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test an example from the manual about the 'amhello' package:
# using VPATH builds to configure the same package with different
diff --git a/t/amhello-cross-compile.sh b/t/amhello-cross-compile.sh
index 556fd46a9..7bc91c90e 100644
--- a/t/amhello-cross-compile.sh
+++ b/t/amhello-cross-compile.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test an example from the manual about the 'amhello' package:
# cross-compiling a package from Linux/Unix to MinGW.
diff --git a/t/aminit-moreargs-deprecation.sh b/t/aminit-moreargs-deprecation.sh
index 045d9f35b..64aa18509 100644
--- a/t/aminit-moreargs-deprecation.sh
+++ b/t/aminit-moreargs-deprecation.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that automake warns against old-style usages of AM_INIT_AUTOMAKE
# (i.e., calls with two or three arguments).
diff --git a/t/aminit-trailing-dnl-comment-pr16841.sh b/t/aminit-trailing-dnl-comment-pr16841.sh
index a238eee76..aa5c2e0a5 100644
--- a/t/aminit-trailing-dnl-comment-pr16841.sh
+++ b/t/aminit-trailing-dnl-comment-pr16841.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that a trailing 'dnl' m4 comment automake after the
# AM_INIT_AUTOMAKE invocation doesn't produce a syntactically
diff --git a/t/amopt.sh b/t/amopt.sh
index d70cdea8a..28042462e 100644
--- a/t/amopt.sh
+++ b/t/amopt.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make Automake diagnose a conditional AUTOMAKE_OPTIONS.
# Report from Bas Wijnen.
diff --git a/t/amopts-location.sh b/t/amopts-location.sh
index 9c1ad3655..39a30c3c3 100644
--- a/t/amopts-location.sh
+++ b/t/amopts-location.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that errors about AUTOMAKE_OPTIONS refers to correct
# locations.
diff --git a/t/amopts-variable-expansion.sh b/t/amopts-variable-expansion.sh
index bae72d60c..0a4a767ff 100644
--- a/t/amopts-variable-expansion.sh
+++ b/t/amopts-variable-expansion.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that AUTOMAKE_OPTIONS support variable expansion.
diff --git a/t/amsubst.sh b/t/amsubst.sh
index d8fda789b..800e99b71 100644
--- a/t/amsubst.sh
+++ b/t/amsubst.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check for _AM_SUBST_NOTMAKE.
diff --git a/t/ansi2knr-no-more.sh b/t/ansi2knr-no-more.sh
index 8c13cd0a3..a3436750c 100644
--- a/t/ansi2knr-no-more.sh
+++ b/t/ansi2knr-no-more.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that any attempt to use the obsolete de-ANSI-fication support
# is diagnosed.
diff --git a/t/ar-lib.sh b/t/ar-lib.sh
index b59470bc7..02d059deb 100644
--- a/t/ar-lib.sh
+++ b/t/ar-lib.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure 'ar-lib' wraps the Microsoft Library Manager (lib) correctly.
diff --git a/t/ar-lib2.sh b/t/ar-lib2.sh
index e144a3ae7..212123a1b 100644
--- a/t/ar-lib2.sh
+++ b/t/ar-lib2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test if AM_PROG_AR installs ar-lib.
diff --git a/t/ar-lib3.sh b/t/ar-lib3.sh
index 836da72e0..5392f734b 100644
--- a/t/ar-lib3.sh
+++ b/t/ar-lib3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test if lib_LIBRARIES requests AM_PROG_AR.
diff --git a/t/ar-lib4.sh b/t/ar-lib4.sh
index 867571b87..b7f45fd98 100644
--- a/t/ar-lib4.sh
+++ b/t/ar-lib4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test if lib_LTLIBRARIES requests AM_PROG_AR.
diff --git a/t/ar-lib5a.sh b/t/ar-lib5a.sh
index 1b19d14a5..11de4b267 100644
--- a/t/ar-lib5a.sh
+++ b/t/ar-lib5a.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test if AM_PROG_AR triggers the use of the ar-lib script.
# This test requires Microsoft lib.
diff --git a/t/ar-lib5b.sh b/t/ar-lib5b.sh
index 675745a31..d7a9dc44c 100644
--- a/t/ar-lib5b.sh
+++ b/t/ar-lib5b.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test if AM_PROG_AR triggers the use of the ar-lib script.
# This test does not require Microsoft lib.
diff --git a/t/ar-lib6a.sh b/t/ar-lib6a.sh
index 6fd1e400b..76a4329c7 100644
--- a/t/ar-lib6a.sh
+++ b/t/ar-lib6a.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test AM_PROG_AR ordering requirements
# Keep this test in sync with sister test 'ar-lib6b.sh'.
diff --git a/t/ar-lib6b.sh b/t/ar-lib6b.sh
index 53fb1cf21..47938561e 100644
--- a/t/ar-lib6b.sh
+++ b/t/ar-lib6b.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test AM_PROG_AR ordering requirements for older Libtools
# Keep this test in sync with sister test 'ar-lib6a.sh'.
diff --git a/t/ar-lib7.sh b/t/ar-lib7.sh
index fdea9d862..d7c21f16e 100644
--- a/t/ar-lib7.sh
+++ b/t/ar-lib7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test if automake warns if ar-lib is missing when AM_PROG_AR is used.
diff --git a/t/ar.sh b/t/ar.sh
index b2eba8eb8..08bcb72a0 100644
--- a/t/ar.sh
+++ b/t/ar.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that AR, ARFLAGS, and RANLIB can be substituted from configure.ac.
diff --git a/t/ar2.sh b/t/ar2.sh
index b6a98891b..1c3f4d6d3 100644
--- a/t/ar2.sh
+++ b/t/ar2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure AR and ARFLAGS are defined for EXTRA_LIBRARIES.
# Report from Kevin Ryde.
diff --git a/t/ar3.sh b/t/ar3.sh
index 2fd66ab70..fc4f9fa99 100644
--- a/t/ar3.sh
+++ b/t/ar3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that AR, ARFLAGS, etc. works also when the macro AM_PROG_AR
# is used.
diff --git a/t/ar4.sh b/t/ar4.sh
index 34e6fd8a1..2a98fb574 100644
--- a/t/ar4.sh
+++ b/t/ar4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test if configure bails out if $AR does not work and AM_PROG_AR is used.
diff --git a/t/ar5.sh b/t/ar5.sh
index 2c1660bbe..3cd7328f7 100644
--- a/t/ar5.sh
+++ b/t/ar5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test the optional argument of AM_PROG_AR.
diff --git a/t/asm.sh b/t/asm.sh
index bc0121fa1..f3e6b5759 100644
--- a/t/asm.sh
+++ b/t/asm.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test of basic assembly functionality.
# Keep this in sync with sister tests 'asm2.sh' and 'asm3.sh'.
diff --git a/t/asm2.sh b/t/asm2.sh
index 02e2a3cd9..6a38d25a5 100644
--- a/t/asm2.sh
+++ b/t/asm2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test of basic preprocessed assembly functionality.
# Keep this in sync with sister tests 'asm.sh' and 'asm3.sh'.
diff --git a/t/asm3.sh b/t/asm3.sh
index 97d12e1d1..925710617 100644
--- a/t/asm3.sh
+++ b/t/asm3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test of basic preprocessed assembly functionality with extension '.sx'.
# Keep this in sync with sister tests 'asm.sh' and 'asm2.sh'.
diff --git a/t/autodist-acconfig-no-subdir.sh b/t/autodist-acconfig-no-subdir.sh
index 1a193ae5a..42a043c3c 100644
--- a/t/autodist-acconfig-no-subdir.sh
+++ b/t/autodist-acconfig-no-subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that 'acconfig.h' is *not* automatically distributed when
# placed in a subdirectory.
diff --git a/t/autodist-acconfig.sh b/t/autodist-acconfig.sh
index 12f2c457d..f22a09ec5 100644
--- a/t/autodist-acconfig.sh
+++ b/t/autodist-acconfig.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that 'acconfig.h' is automatically distributed if it exists
# (at automake runtime).
diff --git a/t/autodist-aclocal-m4.sh b/t/autodist-aclocal-m4.sh
index 1a5c705f8..a605333c3 100644
--- a/t/autodist-aclocal-m4.sh
+++ b/t/autodist-aclocal-m4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that 'aclocal.m4' is not automatically distributed if not
# required to build 'configure'. This is *really* a corner-case
diff --git a/t/autodist-config-headers.sh b/t/autodist-config-headers.sh
index 69ba829e8..f3fb5e35b 100644
--- a/t/autodist-config-headers.sh
+++ b/t/autodist-config-headers.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that config.h.bot and config.h.top are automatically
# distributed if the AC_CONFIG_HADERS macro is used and they
diff --git a/t/autodist-configure-no-subdir.sh b/t/autodist-configure-no-subdir.sh
index 9b9029cc0..9a3860c8f 100644
--- a/t/autodist-configure-no-subdir.sh
+++ b/t/autodist-configure-no-subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that 'configure' and 'configure.ac' are *not* automatically
# distributed when placed in a subdirectory.
diff --git a/t/autodist-no-duplicate.sh b/t/autodist-no-duplicate.sh
index 03456b066..639cf7765 100644
--- a/t/autodist-no-duplicate.sh
+++ b/t/autodist-no-duplicate.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that there are no duplicates in the list of files automatically
# distributed by automake.
diff --git a/t/autodist-stamp-vti.sh b/t/autodist-stamp-vti.sh
index 4710c3b6d..181df6694 100644
--- a/t/autodist-stamp-vti.sh
+++ b/t/autodist-stamp-vti.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that 'stamp-vti' is automatically distributed when info_TEXINFOS
# and version.texi are involved.
diff --git a/t/autodist-subdir.sh b/t/autodist-subdir.sh
index cb4425821..6079e8f88 100644
--- a/t/autodist-subdir.sh
+++ b/t/autodist-subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that automake really automatically distributes all the files
# it advertises to do, even when in subdirectories.
@@ -20,7 +20,7 @@
# This behavior might be suboptimal, but it has been in place for quite
# a long time, and it would be risky to change it now. See also the
# discussion of automake bug#7819:
-#
+#
#
# Keep this test in sync with sister test 'autodist.sh'.
diff --git a/t/autodist.sh b/t/autodist.sh
index 417363b96..0c2d2cacf 100644
--- a/t/autodist.sh
+++ b/t/autodist.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that automake really automatically distributes all the files
# it advertises to do.
diff --git a/t/autohdr-subdir-pr12495.sh b/t/autohdr-subdir-pr12495.sh
index c98d44f3d..e392ba87d 100644
--- a/t/autohdr-subdir-pr12495.sh
+++ b/t/autohdr-subdir-pr12495.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Related to automake bug#12495: Automake shouldn't generate useless
# remake rules for AC_CONFIG_HEADERS arguments after the first one,
diff --git a/t/autohdr.sh b/t/autohdr.sh
index 7cdd96cfc..585ef3e0d 100644
--- a/t/autohdr.sh
+++ b/t/autohdr.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
diff --git a/t/autohdr3.sh b/t/autohdr3.sh
index 08f6ee778..36209bda3 100644
--- a/t/autohdr3.sh
+++ b/t/autohdr3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check rebuild rules for autoheader.
diff --git a/t/autohdr4.sh b/t/autohdr4.sh
index 2dba7dfaf..ae35b7005 100644
--- a/t/autohdr4.sh
+++ b/t/autohdr4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check rebuild rules for AC_CONFIG_HEADERS.
# (This should also work without GNU Make.)
diff --git a/t/autohdrdry.sh b/t/autohdrdry.sh
index 4c5d2e5a6..fb53ab81a 100644
--- a/t/autohdrdry.sh
+++ b/t/autohdrdry.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Removal recovery rules for AC_CONFIG_HEADERS should not remove files
# with 'make -n'.
diff --git a/t/automake-cmdline.tap b/t/automake-cmdline.tap
index b94fbeba5..5f873cdd3 100644
--- a/t/automake-cmdline.tap
+++ b/t/automake-cmdline.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test Automake's command-line options.
diff --git a/t/auxdir-autodetect.sh b/t/auxdir-autodetect.sh
index 535efce47..16db5f1b0 100644
--- a/t/auxdir-autodetect.sh
+++ b/t/auxdir-autodetect.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that, if AC_CONFIG_AUX_DIR is not specified, Automake tries
# to use '.', '..' and '../..', in precisely that order.
diff --git a/t/auxdir-cc-pr15981.sh b/t/auxdir-cc-pr15981.sh
index 0780ae6f5..5285382f2 100644
--- a/t/auxdir-cc-pr15981.sh
+++ b/t/auxdir-cc-pr15981.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test automake bug#15981: automake 1.14 may use $ac_aux_dir
# before it is defined, leading to error messages such as:
diff --git a/t/auxdir-computed.tap b/t/auxdir-computed.tap
index 6201fdbd4..0dae89c9f 100644
--- a/t/auxdir-computed.tap
+++ b/t/auxdir-computed.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# It should be possible to use a computed auxdir. This might seem
# bizarre, but it is actually used in multilib builds.
diff --git a/t/auxdir-misplaced.sh b/t/auxdir-misplaced.sh
index a82c9afd8..fb2cc7b01 100644
--- a/t/auxdir-misplaced.sh
+++ b/t/auxdir-misplaced.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure we diagnose misplaced AC_CONFIG_AUX_DIR.
diff --git a/t/auxdir-nonexistent.sh b/t/auxdir-nonexistent.sh
index f4da1f671..f7a5620f8 100644
--- a/t/auxdir-nonexistent.sh
+++ b/t/auxdir-nonexistent.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we diagnose non-existent AC_CONFIG_AUX_DIR names.
diff --git a/t/auxdir-pr15981.sh b/t/auxdir-pr15981.sh
index c881f8efc..282867159 100644
--- a/t/auxdir-pr15981.sh
+++ b/t/auxdir-pr15981.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# AM_AUX_DIR_EXPAND should ensure $ac_aux_dir is properly initialized.
# Issue revealed by related automake bug#15981.
diff --git a/t/auxdir-pr19311.sh b/t/auxdir-pr19311.sh
index 0fcf5e634..61970cef7 100644
--- a/t/auxdir-pr19311.sh
+++ b/t/auxdir-pr19311.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Automake bug#19311: AC_PROG_CC called before AC_CONFIG_AUX_DIR can
# silently force wrong $ac_aux_dir definition.
diff --git a/t/auxdir-unportable.tap b/t/auxdir-unportable.tap
index 4c465b5a3..1d21f5e07 100644
--- a/t/auxdir-unportable.tap
+++ b/t/auxdir-unportable.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we diagnose unportable AC_CONFIG_AUX_DIR names.
diff --git a/t/auxdir.sh b/t/auxdir.sh
index c280a734b..f3dc58571 100644
--- a/t/auxdir.sh
+++ b/t/auxdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure AC_CONFIG_AUX_DIR works correctly.
diff --git a/t/auxdir6.sh b/t/auxdir6.sh
index a9cba8ff7..964755ef4 100644
--- a/t/auxdir6.sh
+++ b/t/auxdir6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure AC_CONFIG_AUX_DIR works correctly.
# This test calls AC_CONFIG_AUX_DIR with an explicit literal argument,
diff --git a/t/auxdir7.sh b/t/auxdir7.sh
index 20c496d1a..3dcf6e0bf 100644
--- a/t/auxdir7.sh
+++ b/t/auxdir7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure AC_CONFIG_AUX_DIR works correctly.
# This test calls AC_CONFIG_AUX_DIR with a '.' argument, thus explicitly
diff --git a/t/auxdir8.sh b/t/auxdir8.sh
index de9c65199..8e584604a 100644
--- a/t/auxdir8.sh
+++ b/t/auxdir8.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure AC_CONFIG_AUX_DIR works correctly.
# This test tries without an explicit call to AC_CONFIG_AUX_DIR;
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index f85c1b535..3c4bf0120 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
########################################################
### IMPORTANT NOTE: keep this file 'set -e' clean. ###
@@ -102,7 +102,7 @@ is_blocked_signal ()
{
# Use perl, since trying to do this portably in the shell can be
# very tricky, if not downright impossible. For reference, see:
- #
+ #
if $PERL -w -e '
use strict;
use warnings FATAL => "all";
diff --git a/t/ax/cc-no-c-o.in b/t/ax/cc-no-c-o.in
index 9bc802acd..fd51482e4 100644
--- a/t/ax/cc-no-c-o.in
+++ b/t/ax/cc-no-c-o.in
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# A "C compiler" that chokes when the '-c' and '-o' options are passed
# together to it on the command line. See also automake bug#13378.
diff --git a/t/ax/deltree.pl b/t/ax/deltree.pl
index 5148dc2d6..f239057aa 100644
--- a/t/ax/deltree.pl
+++ b/t/ax/deltree.pl
@@ -15,7 +15,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
use strict;
use warnings FATAL => 'all';
diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh
index 9d0036cdf..09cf99933 100644
--- a/t/ax/depcomp.sh
+++ b/t/ax/depcomp.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check dependency tracking in various flavours.
# Contains both libtool and non-libtool case.
@@ -22,7 +22,7 @@
# -------------------------------------------------------------------------
-#
+#
#
# Here's the bug: makedepend will prefix VPATH to the object file name,
# thus the second make will invoke depcomp with object='../../src/foo.o',
@@ -34,8 +34,8 @@
# -------------------------------------------------------------------------
-#
-#
+#
+#
#
# Here's the bug: hp depmode will prefix VPATH to the object file name,
# thus the second gmake will invoke depcomp with object='../../src/foo.o',
@@ -49,8 +49,8 @@
# -------------------------------------------------------------------------
-#
-#
+#
+#
#
# A partial failure of an earlier version of this test; some bad
# post-processing of the '*.Po' files led to the following broken
diff --git a/t/ax/distcheck-hook-m4.am b/t/ax/distcheck-hook-m4.am
index f71793782..321d3923c 100644
--- a/t/ax/distcheck-hook-m4.am
+++ b/t/ax/distcheck-hook-m4.am
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
AUTOMAKE_OPTIONS = -Wno-obsolete
diff --git a/t/ax/extract-testsuite-summary.pl b/t/ax/extract-testsuite-summary.pl
index 180f53926..284eefdcf 100644
--- a/t/ax/extract-testsuite-summary.pl
+++ b/t/ax/extract-testsuite-summary.pl
@@ -15,7 +15,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
use warnings FATAL => 'all';
use strict;
diff --git a/t/ax/is b/t/ax/is
index c085793b5..ba6ea4445 100755
--- a/t/ax/is
+++ b/t/ax/is
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that two whitespace-separated lists are equal.
# Assumes the two lists are passed on the command line separated by
diff --git a/t/ax/is_newest b/t/ax/is_newest
index 1cf0da1c9..e62c132d1 100755
--- a/t/ax/is_newest
+++ b/t/ax/is_newest
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Usage: is_newest FILE FILES
# Fail if any file in FILES is newer than FILE, and print the list of
diff --git a/t/ax/runtest.in b/t/ax/runtest.in
index 7caceb2a9..80a6b1a29 100644
--- a/t/ax/runtest.in
+++ b/t/ax/runtest.in
@@ -14,7 +14,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Run an Automake test from the command line.
diff --git a/t/ax/shell-no-trail-bslash.in b/t/ax/shell-no-trail-bslash.in
index eefd90ea3..fc7b54107 100644
--- a/t/ax/shell-no-trail-bslash.in
+++ b/t/ax/shell-no-trail-bslash.in
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# A "shell" that chokes on '-c' commands and/or shell scripts having
# a trailing '\' character (possibly followed by whitespace only).
diff --git a/t/ax/tap-functions.sh b/t/ax/tap-functions.sh
index 17a6c11b3..efa85a42d 100644
--- a/t/ax/tap-functions.sh
+++ b/t/ax/tap-functions.sh
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Helper functions used by TAP-producing tests of the Automake testsuite.
diff --git a/t/ax/tap-setup.sh b/t/ax/tap-setup.sh
index 0eae2a386..64580c4cf 100644
--- a/t/ax/tap-setup.sh
+++ b/t/ax/tap-setup.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Auxiliary shell script that copies the common data and files used by
# many tests on TAP support into the current directory. It should be
diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh
index 1f22f3fe7..f0c31aa63 100644
--- a/t/ax/tap-summary-aux.sh
+++ b/t/ax/tap-summary-aux.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Auxiliary script for tests on TAP support: checking testsuite summary.
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in
index 8cace053b..04d952133 100644
--- a/t/ax/test-defs.in
+++ b/t/ax/test-defs.in
@@ -14,7 +14,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Defines and minimal setup for Automake testing environment.
@@ -187,7 +187,7 @@ sleep='sleep ''@MODIFICATION_DELAY@'
# An old timestamp that can be given to a file, in "touch -t" format.
# The time stamp should be portable to all file systems of interest.
# Just for fun, choose the exact time of the announcement of the GNU project
-# in UTC; see .
+# in UTC; see .
old_timestamp=198309271735.59
# Make our wrapper script (or installed scripts, if running under
diff --git a/t/ax/test-init.sh b/t/ax/test-init.sh
index bf9017f4c..4311fb7c9 100644
--- a/t/ax/test-init.sh
+++ b/t/ax/test-init.sh
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
set -e
diff --git a/t/ax/test-lib.sh b/t/ax/test-lib.sh
index 2ed15dcf9..5882ef052 100644
--- a/t/ax/test-lib.sh
+++ b/t/ax/test-lib.sh
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
########################################################
### IMPORTANT NOTE: keep this file 'set -e' clean. ###
diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh
index 1d4b9f5cb..0078d1ccf 100644
--- a/t/ax/testsuite-summary-checks.sh
+++ b/t/ax/testsuite-summary-checks.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check the testsuite summary with the parallel test harness. This
# script is meant to be sourced by other test script, so that it can
diff --git a/t/ax/trivial-test-driver b/t/ax/trivial-test-driver
index 8885fb331..5745fe3d9 100644
--- a/t/ax/trivial-test-driver
+++ b/t/ax/trivial-test-driver
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
# Test driver for a very simple test protocol used by the Automake
diff --git a/t/backcompat-acout.sh b/t/backcompat-acout.sh
index bfe0a28bc..262f72997 100644
--- a/t/backcompat-acout.sh
+++ b/t/backcompat-acout.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Backward-compatibility: AC_OUTPUT with arguments.
diff --git a/t/backcompat.sh b/t/backcompat.sh
index a61400cd3..83e605847 100644
--- a/t/backcompat.sh
+++ b/t/backcompat.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test usage of AM_INIT_AUTOMAKE with two or three arguments, for
# backward-compatibility.
diff --git a/t/backcompat2.sh b/t/backcompat2.sh
index 7f2e9e214..43a43868b 100644
--- a/t/backcompat2.sh
+++ b/t/backcompat2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Backward-compatibility test: check that AM_INIT_AUTOMAKE with two or
# three arguments does AC_DEFINE the symbols PACKAGE and VERSION iff the
diff --git a/t/backcompat3.sh b/t/backcompat3.sh
index 718d0ad4a..88047827d 100644
--- a/t/backcompat3.sh
+++ b/t/backcompat3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Backward-compatibility test: check what happens when AC_INIT and
# AM_INIT_AUTOMAKE are both given two or more arguments.
diff --git a/t/backcompat6.sh b/t/backcompat6.sh
index 52b7a1a9d..7defb4382 100644
--- a/t/backcompat6.sh
+++ b/t/backcompat6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Backward-compatibility test: try to build and distribute a package
# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT.
diff --git a/t/backslash-before-trailing-whitespace.sh b/t/backslash-before-trailing-whitespace.sh
index f024404e1..843c6ef2f 100644
--- a/t/backslash-before-trailing-whitespace.sh
+++ b/t/backslash-before-trailing-whitespace.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we diagnose and fix white spaces following backslash.
# Report from Peter Muir.
diff --git a/t/backslash-issues.sh b/t/backslash-issues.sh
index c0c326272..21102346d 100644
--- a/t/backslash-issues.sh
+++ b/t/backslash-issues.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for "\" problems.
# TODO: might be nice to convert this to TAP...
diff --git a/t/badline.sh b/t/badline.sh
index 5dd23ec26..c1dd4b0a7 100644
--- a/t/badline.sh
+++ b/t/badline.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that line number and file name in error message
# referring to variable is always correct.
diff --git a/t/badopt.sh b/t/badopt.sh
index 1b2d09973..dad8b2a2d 100644
--- a/t/badopt.sh
+++ b/t/badopt.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure bad options cause error.
diff --git a/t/badprog.sh b/t/badprog.sh
index 8b2dbbd95..5620f3830 100644
--- a/t/badprog.sh
+++ b/t/badprog.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that programs with bad names are properly
# transformed.
diff --git a/t/built-sources-check.sh b/t/built-sources-check.sh
index 170dafbc9..7b2de2569 100644
--- a/t/built-sources-check.sh
+++ b/t/built-sources-check.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure 'check:' honors $(BUILT_SOURCES).
# PR/359.
diff --git a/t/built-sources-cond.sh b/t/built-sources-cond.sh
index 5ec58fded..57b6abea4 100644
--- a/t/built-sources-cond.sh
+++ b/t/built-sources-cond.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Interaction of BUILT_SOURCES with conditionals.
diff --git a/t/built-sources-fork-bomb.sh b/t/built-sources-fork-bomb.sh
index 4c58fcfc6..59ded6931 100644
--- a/t/built-sources-fork-bomb.sh
+++ b/t/built-sources-fork-bomb.sh
@@ -12,15 +12,15 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Due to how the handling of $(BUILT_SOURCES) is implemented in Automake-NG,
# a recursive make call in the recipe of any $(BUILT_SOURCES) (or of any of
# its prerequisites) might cause an infinite recursion (complete with fork
# bomb, yuck) if not handled correctly. Verify that this doesn't happen.
# For more background, see:
-#
-#
+#
+#
# Backported to improve coverage of mainline Automake.
required=GNUmake
diff --git a/t/built-sources-install.sh b/t/built-sources-install.sh
index 6a59aa2fd..8f9103d36 100644
--- a/t/built-sources-install.sh
+++ b/t/built-sources-install.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure 'install:' honors $(BUILT_SOURCES).
# PR/359.
diff --git a/t/built-sources-subdir.sh b/t/built-sources-subdir.sh
index 04b529881..9f892fa46 100644
--- a/t/built-sources-subdir.sh
+++ b/t/built-sources-subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure when using SUBDIRS that all BUILT_SOURCES are built.
# A bug occurred where subdirs do not have all-recursive or
diff --git a/t/built-sources.sh b/t/built-sources.sh
index 139cf4e6a..99d5bca03 100644
--- a/t/built-sources.sh
+++ b/t/built-sources.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Basic test on BUILT_SOURCES.
diff --git a/t/c-demo.sh b/t/c-demo.sh
index 4a2c8d100..ff3616ca7 100644
--- a/t/c-demo.sh
+++ b/t/c-demo.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Demo on C support, also testing automatic dependency tracking,
# conditional SUBDIRS and convenience libraries.
@@ -76,7 +76,7 @@ nodist_lib_convenience_a_SOURCES = foo.h
# ensure that cleaning rules work correctly; an older implementation
# of automatic dependency tracking support suffered of weaknesses in
# this situation, see the "historical comments" reported in:
-# http://lists.gnu.org/archive/html/automake-patches/2012-06/msg00033.html
+# https://lists.gnu.org/archive/html/automake-patches/2012-06/msg00033.html
foo.h: $(srcdir)/foo.c
sed -n 's/.*foo *(.*/&;/p' "$(srcdir)/foo.c" >$@-t
test 1 -eq `wc -l <$@-t`
diff --git a/t/candist.sh b/t/candist.sh
index d723b264b..19615aab0 100644
--- a/t/candist.sh
+++ b/t/candist.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure things that cannot be dist_'ed are diagnosed.
diff --git a/t/canon-name.sh b/t/canon-name.sh
index 520d5f0cf..c8a071fca 100644
--- a/t/canon-name.sh
+++ b/t/canon-name.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# PR 511: Make sure we warn about e.g. AC_CONFIG_FILES([./gmakefile]),
# as not all make implementations treat 'file' and './file' equally.
diff --git a/t/canon.sh b/t/canon.sh
index ca7c92b4e..9c0915330 100644
--- a/t/canon.sh
+++ b/t/canon.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that name canonicalization error works.
diff --git a/t/canon2.sh b/t/canon2.sh
index b72c1b241..d6c451001 100644
--- a/t/canon2.sh
+++ b/t/canon2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure name canonicalization happens for texinfo.
diff --git a/t/canon3.sh b/t/canon3.sh
index 853eb25af..20933039a 100644
--- a/t/canon3.sh
+++ b/t/canon3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Yet another canonicalization test.
diff --git a/t/canon4.sh b/t/canon4.sh
index e68419f99..44bf47b4c 100644
--- a/t/canon4.sh
+++ b/t/canon4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure name canonicalization happens for static libraries.
# Keep this in sync with sister test 'canon6.sh'.
diff --git a/t/canon5.sh b/t/canon5.sh
index 098effcfb..e54877cff 100644
--- a/t/canon5.sh
+++ b/t/canon5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that we allow variable names starting in
# non-letters. Whatever that might mean.
diff --git a/t/canon6.sh b/t/canon6.sh
index 01b3939c4..ea832a080 100644
--- a/t/canon6.sh
+++ b/t/canon6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure name canonicalization happens for libtool libraries.
# Keep this in sync with sister test 'canon4.sh'.
diff --git a/t/canon7.sh b/t/canon7.sh
index fe44e76a8..37c28f2f4 100644
--- a/t/canon7.sh
+++ b/t/canon7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Stress test on canonicalization.
diff --git a/t/canon8.sh b/t/canon8.sh
index 66e861649..ae9440c4b 100644
--- a/t/canon8.sh
+++ b/t/canon8.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that canonicalization does not transliterate the '@' charactrer.
diff --git a/t/ccnoco-deps.sh b/t/ccnoco-deps.sh
index ea44a9158..d5264ae33 100755
--- a/t/ccnoco-deps.sh
+++ b/t/ccnoco-deps.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that dependency tracking can also work with compilers that
# doesn't understand '-c -o', even if the AM_PROG_CC_C_O macro is not
diff --git a/t/ccnoco-lib.sh b/t/ccnoco-lib.sh
index 09a8835be..97146ba1c 100755
--- a/t/ccnoco-lib.sh
+++ b/t/ccnoco-lib.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure we can compile when the compiler doesn't
# understand '-c -o'.
diff --git a/t/ccnoco-lt.sh b/t/ccnoco-lt.sh
index 6cec96a66..3088b1a35 100755
--- a/t/ccnoco-lt.sh
+++ b/t/ccnoco-lt.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure we can compile libtool libraries when the compiler
# doesn't understand '-c -o'.
diff --git a/t/ccnoco.sh b/t/ccnoco.sh
index ac61ba62f..48fb86a15 100644
--- a/t/ccnoco.sh
+++ b/t/ccnoco.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure we can compile when the compiler doesn't
# understand '-c -o'.
diff --git a/t/ccnoco3.sh b/t/ccnoco3.sh
index 75c193cbe..4cd4443bf 100644
--- a/t/ccnoco3.sh
+++ b/t/ccnoco3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure 'compile' doesn't call 'mv SRC SRC'.
diff --git a/t/ccnoco4.sh b/t/ccnoco4.sh
index eba300275..7b3a458a7 100644
--- a/t/ccnoco4.sh
+++ b/t/ccnoco4.sh
@@ -12,15 +12,15 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that Automake-generated C compilation rules don't mistakenly
# use the "-c -o" options combination unconditionally (even with losing
# compilers) when the 'subdir-objects' is used but sources are only
# present in the top-level directory. Reported by Nick Bowler in the
# discussion on automake bug#13378:
-#
-#
+#
+#
required=gcc # For cc-no-c-o.
. test-init.sh
diff --git a/t/check-concurrency-bug9245.sh b/t/check-concurrency-bug9245.sh
index 78c274c99..28744ecce 100644
--- a/t/check-concurrency-bug9245.sh
+++ b/t/check-concurrency-bug9245.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Look for a bug where FreeBSD make in concurrent mode reported success
# even when the Automake-generated parallel testsuite harness failed.
diff --git a/t/check-exported-srcdir.sh b/t/check-exported-srcdir.sh
index 688344d7e..5050fe032 100644
--- a/t/check-exported-srcdir.sh
+++ b/t/check-exported-srcdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the testsuite driver (either with or without the
# serial-tests option enabled) exports the 'srcdir' value in the
diff --git a/t/check-fd-redirect.sh b/t/check-fd-redirect.sh
index c668d4e50..8be88e8ec 100644
--- a/t/check-fd-redirect.sh
+++ b/t/check-fd-redirect.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Simple Tests support: redirection of file descriptors with
# AM_TESTS_FD_REDIRECT.
diff --git a/t/check-no-test-driver.sh b/t/check-no-test-driver.sh
index 36f6f7352..a059616e5 100644
--- a/t/check-no-test-driver.sh
+++ b/t/check-no-test-driver.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that auxiliary script 'test-driver' doesn't get needlessly
# installed or referenced when the 'serial-tests' option is used.
diff --git a/t/check-subst-prog.sh b/t/check-subst-prog.sh
index 237ad298d..d4a1e4d85 100644
--- a/t/check-subst-prog.sh
+++ b/t/check-subst-prog.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check @substituted@ TESTS, some of which are also PROGRAMS.
# See also sister test 'check-subst.sh'.
diff --git a/t/check-subst.sh b/t/check-subst.sh
index 77886d464..35a989464 100644
--- a/t/check-subst.sh
+++ b/t/check-subst.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check @substituted@ TESTS.
# Note that in this test, we rely on the .test extension for the
diff --git a/t/check-tests-in-builddir.sh b/t/check-tests-in-builddir.sh
index b9070bc5f..b09c336fe 100644
--- a/t/check-tests-in-builddir.sh
+++ b/t/check-tests-in-builddir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the testsuite driver can find test in the srcdir as
# well as in builddir, and that is prefers those in the builddir.
diff --git a/t/check.sh b/t/check.sh
index b7956cc64..f6aa2d62a 100644
--- a/t/check.sh
+++ b/t/check.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test Automake style tests.
diff --git a/t/check10.sh b/t/check10.sh
index 92a023388..b9e577290 100644
--- a/t/check10.sh
+++ b/t/check10.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check singular and plural in test summaries.
diff --git a/t/check11.sh b/t/check11.sh
index 9f34405f6..fe6860017 100644
--- a/t/check11.sh
+++ b/t/check11.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check skip summary.
diff --git a/t/check12.sh b/t/check12.sh
index 9a63a43d6..4c4594a6d 100644
--- a/t/check12.sh
+++ b/t/check12.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure dejagnu tests, automake-style tests, and check-local
# target can coexist.
diff --git a/t/check2.sh b/t/check2.sh
index 9fa183715..bb6b1414f 100644
--- a/t/check2.sh
+++ b/t/check2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test Automake style tests.
diff --git a/t/check4.sh b/t/check4.sh
index 73e488322..7ec30cf28 100644
--- a/t/check4.sh
+++ b/t/check4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure 'make -k check' processes all directories.
diff --git a/t/check5.sh b/t/check5.sh
index a793c83c4..0d45cf76c 100644
--- a/t/check5.sh
+++ b/t/check5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test TESTS = $(check_PROGRAMS)
diff --git a/t/check6.sh b/t/check6.sh
index 870aed9a1..2efeb0524 100644
--- a/t/check6.sh
+++ b/t/check6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR 400: XFAIL_TESTS delimited by TABs.
# Also test that Solaris make VPATH rewriting is honored
diff --git a/t/check7.sh b/t/check7.sh
index bdf6fcc7d..ff08a049f 100644
--- a/t/check7.sh
+++ b/t/check7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check EXEEXT extension for XFAIL_TESTS.
diff --git a/t/check8.sh b/t/check8.sh
index cafcf4661..a37ad4e38 100644
--- a/t/check8.sh
+++ b/t/check8.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check subdir TESTS.
diff --git a/t/checkall.sh b/t/checkall.sh
index 8e2f54335..f8066b30d 100644
--- a/t/checkall.sh
+++ b/t/checkall.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug where check target doesn't depend on all.
diff --git a/t/clean.sh b/t/clean.sh
index 4d27b911d..565ea904a 100644
--- a/t/clean.sh
+++ b/t/clean.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure a clean target depends on previous one.
diff --git a/t/colneq.sh b/t/colneq.sh
index bdef0ce5e..8a58e63c0 100644
--- a/t/colneq.sh
+++ b/t/colneq.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that := definitions produce warnings, but otherwise work.
diff --git a/t/colneq2.sh b/t/colneq2.sh
index 44408b4dd..9172fca43 100644
--- a/t/colneq2.sh
+++ b/t/colneq2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that := in var substitutions works.
diff --git a/t/colneq3.sh b/t/colneq3.sh
index ced4ce3f9..36c05d96a 100644
--- a/t/colneq3.sh
+++ b/t/colneq3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that := definitions work as expected at make time.
diff --git a/t/colon.sh b/t/colon.sh
index 620a97384..6a72d7fe1 100644
--- a/t/colon.sh
+++ b/t/colon.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug reported by Nyul Laszlo. When using the ":" syntax in
# AC_OUTPUT, Automake fails to find the correct file.
diff --git a/t/colon2.sh b/t/colon2.sh
index 17c9a418c..0453fa149 100644
--- a/t/colon2.sh
+++ b/t/colon2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure ":" works with files automake generates.
# See also sister test 'colon3.sh'.
diff --git a/t/colon3.sh b/t/colon3.sh
index fcad75284..840fc313a 100644
--- a/t/colon3.sh
+++ b/t/colon3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure ":" works with files automake generates.
# This test is for multiple ":"s.
diff --git a/t/colon4.sh b/t/colon4.sh
index f296346e0..6f01857fe 100644
--- a/t/colon4.sh
+++ b/t/colon4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure multiple ":"s in AC_CONFIG_FILES do not generate broken
# rebuild rules.
diff --git a/t/colon5.sh b/t/colon5.sh
index 4ffa82009..50d014407 100644
--- a/t/colon5.sh
+++ b/t/colon5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Another multi-":" test, this time from Doug Evans.
diff --git a/t/colon6.sh b/t/colon6.sh
index 51d6819e4..f33f4fefe 100644
--- a/t/colon6.sh
+++ b/t/colon6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Yet another multi-":" test, this time from Ken Pizzini.
diff --git a/t/colon7.sh b/t/colon7.sh
index 1adf681de..a0ae9369d 100644
--- a/t/colon7.sh
+++ b/t/colon7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Another test for a failing ":" in AC_OUTPUT.
# Report from Maciej Stachowiak.
diff --git a/t/color-tests-opt.sh b/t/color-tests-opt.sh
index e930ae20e..6f8e543d0 100644
--- a/t/color-tests-opt.sh
+++ b/t/color-tests-opt.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the 'color-tests' option, now active by default, is
# nonetheless still silently accepted, for backward compatibility.
diff --git a/t/color-tests.sh b/t/color-tests.sh
index 34d41d39a..300c6bd85 100644
--- a/t/color-tests.sh
+++ b/t/color-tests.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test Automake TESTS color output, by forcing it.
# Keep this in sync with the sister test 'color-tests2.sh'.
diff --git a/t/color-tests2.sh b/t/color-tests2.sh
index f24e18447..7def8fa88 100644
--- a/t/color-tests2.sh
+++ b/t/color-tests2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test Automake TESTS color output, using the expect(1) program.
# Keep this in sync with the sister test 'color-tests.sh'.
diff --git a/t/commen10.sh b/t/commen10.sh
index 205ba482d..a8e67ebd9 100644
--- a/t/commen10.sh
+++ b/t/commen10.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure comments following trailing backslashes are diagnosed.
# Report from Harald Dunkel.
diff --git a/t/commen11.sh b/t/commen11.sh
index 41a6a2766..0f9cf722d 100644
--- a/t/commen11.sh
+++ b/t/commen11.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure backslash-newline-hash combinations are diagnosed as
# comments following a trailing backslash, even when the combination
diff --git a/t/comment-block.sh b/t/comment-block.sh
index 34c46db22..7c3712f69 100644
--- a/t/comment-block.sh
+++ b/t/comment-block.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure block comments are not double-spaced.
# Report from François Pinard.
diff --git a/t/comment.sh b/t/comment.sh
index 412cc938f..fedf97ec0 100644
--- a/t/comment.sh
+++ b/t/comment.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that '#' as start of word in AUTOMAKE_OPTIONS means
# comment.
diff --git a/t/comment2.sh b/t/comment2.sh
index 129396efc..e78d6e41f 100644
--- a/t/comment2.sh
+++ b/t/comment2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure comment recognition works in PROGRAMS. Report from Mark
# Galassi.
diff --git a/t/comment3.sh b/t/comment3.sh
index 3f0e02301..7a595b46f 100644
--- a/t/comment3.sh
+++ b/t/comment3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that '#' after a tab is a failure.
# The Tru64 Unix V5.1 system make will pass these to the
diff --git a/t/comment4.sh b/t/comment4.sh
index cf7cc5ca8..eeb012e2e 100644
--- a/t/comment4.sh
+++ b/t/comment4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure commented variables are output near their comments.
diff --git a/t/comment5.sh b/t/comment5.sh
index bcc8218f7..ac15884f0 100644
--- a/t/comment5.sh
+++ b/t/comment5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR/280.
# (Automake should complain about trailing backslashes in comments.)
diff --git a/t/comment6.sh b/t/comment6.sh
index 2593a2b6c..2e5455af9 100644
--- a/t/comment6.sh
+++ b/t/comment6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR/322.
# Automake 1.6.1 seems to have a problem parsing comments that use
diff --git a/t/comment7.sh b/t/comment7.sh
index b7bd9989c..d2efdfc96 100644
--- a/t/comment7.sh
+++ b/t/comment7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure comment for conditional variables are output near the
# corresponding conditional definitions.
diff --git a/t/comment8.sh b/t/comment8.sh
index eac61b0ed..bee420e16 100644
--- a/t/comment8.sh
+++ b/t/comment8.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure += does not append to a comment.
# Report from Stepan Kasal.
diff --git a/t/comment9.sh b/t/comment9.sh
index 72eff4e8d..299a75ba2 100644
--- a/t/comment9.sh
+++ b/t/comment9.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure ##-comments are ignored in variable definitions.
# Report from Julien Sopena.
diff --git a/t/comments-in-var-def.sh b/t/comments-in-var-def.sh
index a8ec739b5..fc991dbe2 100644
--- a/t/comments-in-var-def.sh
+++ b/t/comments-in-var-def.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure Automake ignores in-line comments when using variables,
# but preserve them in the output.
diff --git a/t/compile.sh b/t/compile.sh
index ec1026182..086fdd963 100644
--- a/t/compile.sh
+++ b/t/compile.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure 'compile' preserves spaces in its arguments.
diff --git a/t/compile2.sh b/t/compile2.sh
index 49eab5e23..602a66a22 100644
--- a/t/compile2.sh
+++ b/t/compile2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure 'compile' deals correctly with Windows-style paths.
diff --git a/t/compile3.sh b/t/compile3.sh
index d87953fbf..d8b5a28d1 100644
--- a/t/compile3.sh
+++ b/t/compile3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure 'compile' wraps the Microsoft C/C++ compiler (cl) correctly
diff --git a/t/compile4.sh b/t/compile4.sh
index d8020d6b6..630d8b681 100644
--- a/t/compile4.sh
+++ b/t/compile4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure 'compile' wraps the Microsoft C/C++ compiler (cl) correctly
# with respect to absolute paths.
diff --git a/t/compile5.sh b/t/compile5.sh
index ada706ba0..9e96083e7 100644
--- a/t/compile5.sh
+++ b/t/compile5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure the file name translation in the 'compile' script works
# correctly
diff --git a/t/compile6.sh b/t/compile6.sh
index 6bcaf22f8..7a72eea4d 100644
--- a/t/compile6.sh
+++ b/t/compile6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure 'compile' searches libraries correctly
diff --git a/t/compile7.sh b/t/compile7.sh
index c6405d919..d2eb8f887 100644
--- a/t/compile7.sh
+++ b/t/compile7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure 'compile' wraps the Intel C/C++ compiler (icl) correctly
# with respect to absolute paths.
diff --git a/t/compile_f90_c_cxx.sh b/t/compile_f90_c_cxx.sh
index b65ae9c51..986683614 100644
--- a/t/compile_f90_c_cxx.sh
+++ b/t/compile_f90_c_cxx.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure rules to invoke all compilers are selected with
# mixed source objects.
diff --git a/t/compile_f_c_cxx.sh b/t/compile_f_c_cxx.sh
index 7fd3b8e3c..c0e4717b5 100644
--- a/t/compile_f_c_cxx.sh
+++ b/t/compile_f_c_cxx.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure rules to invoke all compilers are selected with
# mixed source objects.
diff --git a/t/cond-basic.sh b/t/cond-basic.sh
index 4b03769b7..9ddeb1c5d 100644
--- a/t/cond-basic.sh
+++ b/t/cond-basic.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check basic use of conditionals.
diff --git a/t/cond.sh b/t/cond.sh
index feb971acb..f4a8b487f 100644
--- a/t/cond.sh
+++ b/t/cond.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check basic use of conditionals.
diff --git a/t/cond10.sh b/t/cond10.sh
index 5600c885d..8a1d68f89 100644
--- a/t/cond10.sh
+++ b/t/cond10.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug in conditionals. From Raja R Harinath.
diff --git a/t/cond11.sh b/t/cond11.sh
index 921050209..20f4af783 100644
--- a/t/cond11.sh
+++ b/t/cond11.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug in conditionals. From Richard Boulton.
# This checks that, if LDADD is set from a conditional variable
diff --git a/t/cond13.sh b/t/cond13.sh
index 02c31730e..c2e78e5a8 100644
--- a/t/cond13.sh
+++ b/t/cond13.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug in conditionals.
# Report from Lars J. Aas.
diff --git a/t/cond14.sh b/t/cond14.sh
index 8ff22f61d..1cfd30233 100644
--- a/t/cond14.sh
+++ b/t/cond14.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug in conditionals.
# Report from Robert Boehne.
diff --git a/t/cond15.sh b/t/cond15.sh
index 3186700cb..d11882ba4 100644
--- a/t/cond15.sh
+++ b/t/cond15.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Regression test for conditionally defined overriding of automatic rules.
diff --git a/t/cond16.sh b/t/cond16.sh
index 6d63deaa3..e34b23f4b 100644
--- a/t/cond16.sh
+++ b/t/cond16.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug in conditionals in SOURCES with variable substitution
# references.
diff --git a/t/cond17.sh b/t/cond17.sh
index 5f325712b..82405f05b 100644
--- a/t/cond17.sh
+++ b/t/cond17.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for being able to define an object to be generated in different ways
# according to a conditional.
diff --git a/t/cond18.sh b/t/cond18.sh
index 8a1b1d716..70e2edab4 100644
--- a/t/cond18.sh
+++ b/t/cond18.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Regression test for substitution references to conditional variables.
# Report from Richard Boulton.
diff --git a/t/cond19.sh b/t/cond19.sh
index feb3b2c32..ecdf014e1 100644
--- a/t/cond19.sh
+++ b/t/cond19.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Regression test for substitution references to conditional variables.
# Report from Richard Boulton.
diff --git a/t/cond20.sh b/t/cond20.sh
index 395649512..dfbb6e3f7 100644
--- a/t/cond20.sh
+++ b/t/cond20.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Regression test for recursion handling in substitution references to
# conditional variables.
diff --git a/t/cond21.sh b/t/cond21.sh
index 94d76f825..7aecdc24c 100644
--- a/t/cond21.sh
+++ b/t/cond21.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check for use of = and += in different conditions.
diff --git a/t/cond22.sh b/t/cond22.sh
index fd8b88466..3812f08c0 100644
--- a/t/cond22.sh
+++ b/t/cond22.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Regression test for bug when sources listed in conditional.
# Report from Richard Boulton. PR/326.
diff --git a/t/cond23.sh b/t/cond23.sh
index 7af89964f..56518b3e0 100644
--- a/t/cond23.sh
+++ b/t/cond23.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
# Report from Patrik Weiskircher.
diff --git a/t/cond24.sh b/t/cond24.sh
index 9fc4abb70..3cfda5a83 100644
--- a/t/cond24.sh
+++ b/t/cond24.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
# Report from Patrik Weiskircher.
diff --git a/t/cond25.sh b/t/cond25.sh
index e654ce1c1..e93c0ef60 100644
--- a/t/cond25.sh
+++ b/t/cond25.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that conditional primaries can use non-conditional directories.
# From Pavel Roskin.
diff --git a/t/cond26.sh b/t/cond26.sh
index 01af6c4a5..535a021ca 100644
--- a/t/cond26.sh
+++ b/t/cond26.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that non-conditional primaries can use conditional directories.
# Reported by Juergen Keil.
diff --git a/t/cond27.sh b/t/cond27.sh
index b56973b06..a47f5de58 100644
--- a/t/cond27.sh
+++ b/t/cond27.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that non-conditional primaries cannot use directories defined
# in some conditions (but not others).
diff --git a/t/cond28.sh b/t/cond28.sh
index 1f492884d..6238ab767 100644
--- a/t/cond28.sh
+++ b/t/cond28.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that conditional primaries can use directories defined
# in the same conditions (but not others).
diff --git a/t/cond3.sh b/t/cond3.sh
index 647bafa96..421fd15ef 100644
--- a/t/cond3.sh
+++ b/t/cond3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test sources listed in conditional.
# Report from Rob Savoye , and Lars J. Aas.
diff --git a/t/cond30.sh b/t/cond30.sh
index cd0d113c1..3bfcd809e 100644
--- a/t/cond30.sh
+++ b/t/cond30.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# For PR/352: make sure we support bin_PROGRAMS being defined conditionally.
diff --git a/t/cond31.sh b/t/cond31.sh
index 77ad9b57f..1f4ebbdea 100644
--- a/t/cond31.sh
+++ b/t/cond31.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we define conditional _DEPENDENCIES correctly.
diff --git a/t/cond32.sh b/t/cond32.sh
index 2e92d6aca..879dda9dd 100644
--- a/t/cond32.sh
+++ b/t/cond32.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure the user can override a conditional _DEPENDENCIES.
diff --git a/t/cond33.sh b/t/cond33.sh
index 99147d50c..b9e24dac1 100644
--- a/t/cond33.sh
+++ b/t/cond33.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that conditionally-defined install directories are handled
# correctly.
diff --git a/t/cond34.sh b/t/cond34.sh
index 224a10d52..0682faf7b 100644
--- a/t/cond34.sh
+++ b/t/cond34.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check for _DEPENDENCIES definition with conditional _LDADD.
# Report from Elena A. Vengerova.
diff --git a/t/cond35.sh b/t/cond35.sh
index d6fffb29a..bfac89ec5 100644
--- a/t/cond35.sh
+++ b/t/cond35.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check rules output for parser defined conditionally.
# Report from Roman Fietze.
diff --git a/t/cond36.sh b/t/cond36.sh
index f913a087f..09e39690d 100644
--- a/t/cond36.sh
+++ b/t/cond36.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check rules output for parser defined conditionally.
diff --git a/t/cond37.sh b/t/cond37.sh
index 2fe057e31..96587aa01 100644
--- a/t/cond37.sh
+++ b/t/cond37.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check conditional local rules.
# Report from Simon Josefsson.
diff --git a/t/cond38.sh b/t/cond38.sh
index 2b0bef2b6..2e212ff62 100644
--- a/t/cond38.sh
+++ b/t/cond38.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check conditional variable ordering.
# Report from Ed Hartnett.
diff --git a/t/cond39.sh b/t/cond39.sh
index 210c8377a..57523bbc6 100644
--- a/t/cond39.sh
+++ b/t/cond39.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Build either as CONFIG_FILE or as PROGRAM.
diff --git a/t/cond4.sh b/t/cond4.sh
index a40f66271..b37377249 100644
--- a/t/cond4.sh
+++ b/t/cond4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Another sources-in-conditional test. Report from Tim Goodwin.
diff --git a/t/cond40.sh b/t/cond40.sh
index a17c69935..dd737c513 100644
--- a/t/cond40.sh
+++ b/t/cond40.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test AM_COND_IF.
diff --git a/t/cond41.sh b/t/cond41.sh
index 7cdc99299..00a605eb1 100644
--- a/t/cond41.sh
+++ b/t/cond41.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# AM_COND_IF with an undefined condition should fail.
diff --git a/t/cond42.sh b/t/cond42.sh
index c4c3b5de8..0ac8e57f3 100644
--- a/t/cond42.sh
+++ b/t/cond42.sh
@@ -13,7 +13,7 @@ nfig
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure an error with inconsistent state of conditionals in configure.ac.
# This shouldn't happen with user input, as _AM_COND_* are not documented,
diff --git a/t/cond43.sh b/t/cond43.sh
index c1e832d85..0eb188d90 100644
--- a/t/cond43.sh
+++ b/t/cond43.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure an error with underquoted usage of AM_COND_IF in configure.ac.
diff --git a/t/cond44.sh b/t/cond44.sh
index b2afc612a..2cea626dd 100644
--- a/t/cond44.sh
+++ b/t/cond44.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that redefinitions of AC_SUBST'ed AM_SUBST_NOTMAKE'd variables
# are not diagnosed. See 'cond23.sh'.
diff --git a/t/cond45.sh b/t/cond45.sh
index d4adbe3fc..e51d346a1 100644
--- a/t/cond45.sh
+++ b/t/cond45.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that redefinitions of AC_SUBST'ed AM_SUBST_NOTMAKE'd variables
# are not diagnosed. See 'cond24.sh'.
diff --git a/t/cond46.sh b/t/cond46.sh
index d221903c4..de54c969e 100644
--- a/t/cond46.sh
+++ b/t/cond46.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure the right condition is listed after 'else' and 'endif'.
diff --git a/t/cond5.sh b/t/cond5.sh
index 2f3a4fa74..73cd39ebf 100644
--- a/t/cond5.sh
+++ b/t/cond5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Yet another sources-in-conditional test. Report from Tim Goodwin.
diff --git a/t/cond6.sh b/t/cond6.sh
index 4a3ce2d48..834aa32fd 100644
--- a/t/cond6.sh
+++ b/t/cond6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for an odd conditional bug. Report from Matt Leach.
diff --git a/t/cond7.sh b/t/cond7.sh
index 9d0660402..4accccd68 100644
--- a/t/cond7.sh
+++ b/t/cond7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for an odd conditional bug. Report from Pavel Roskin.
diff --git a/t/cond8.sh b/t/cond8.sh
index 716294005..76353f785 100644
--- a/t/cond8.sh
+++ b/t/cond8.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure _PROGRAMS conditionals can be written in a useful
# way.
diff --git a/t/cond9.sh b/t/cond9.sh
index d9fd2dbb7..1c5fa2a5c 100644
--- a/t/cond9.sh
+++ b/t/cond9.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug in conditionals. From Raja R Harinath.
diff --git a/t/condd.sh b/t/condd.sh
index fe9d5e3ac..64e874632 100644
--- a/t/condd.sh
+++ b/t/condd.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug in conditionals.
diff --git a/t/condhook.sh b/t/condhook.sh
index 3885db748..2e817c8eb 100644
--- a/t/condhook.sh
+++ b/t/condhook.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test install when a conditional install-*-hook is not defined.
# Keep this in sync with sister test 'condhook2.sh'.
diff --git a/t/condhook2.sh b/t/condhook2.sh
index e96da111c..4901897c4 100644
--- a/t/condhook2.sh
+++ b/t/condhook2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test install when a conditional install-*-hook is defined.
# Keep this in sync with sister test 'condhook.sh'.
diff --git a/t/condinc.sh b/t/condinc.sh
index db73a3c6d..ba2d8636e 100644
--- a/t/condinc.sh
+++ b/t/condinc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure a conditional include statement is handled properly.
diff --git a/t/condinc2.sh b/t/condinc2.sh
index f92a57b95..5983d262d 100644
--- a/t/condinc2.sh
+++ b/t/condinc2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Another test of conditional include statements.
diff --git a/t/condlib.sh b/t/condlib.sh
index a1bfff1eb..1a6966757 100644
--- a/t/condlib.sh
+++ b/t/condlib.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug with conditional library.
# From Harlan Stenn.
diff --git a/t/condman2.sh b/t/condman2.sh
index e06f63d04..7229b588d 100644
--- a/t/condman2.sh
+++ b/t/condman2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure appropriate man install targets generated in all cases.
diff --git a/t/condman3.sh b/t/condman3.sh
index 1be709569..59d33266e 100644
--- a/t/condman3.sh
+++ b/t/condman3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure conditionals work with man pages.
diff --git a/t/confdeps.sh b/t/confdeps.sh
index fbd1c770d..dde90b41e 100644
--- a/t/confdeps.sh
+++ b/t/confdeps.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that config* files are properly regenerated.
diff --git a/t/conff.sh b/t/conff.sh
index d62b3eab8..3512a9025 100644
--- a/t/conff.sh
+++ b/t/conff.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure rebuild rules work even when AC_CONFIG_FILES uses colons.
# Report from Alexander Turbov.
diff --git a/t/conff2.sh b/t/conff2.sh
index c0b41eaa5..6aff1eb38 100644
--- a/t/conff2.sh
+++ b/t/conff2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure empty calls to AC_CONFIG_FILES or AC_CONFIG_HEADERS are diagnosed.
diff --git a/t/conffile-leading-dot.sh b/t/conffile-leading-dot.sh
index feb2e146b..e6eadbe01 100644
--- a/t/conffile-leading-dot.sh
+++ b/t/conffile-leading-dot.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Automake must complain if AC_CONFIG_FILES is passed something starting
# with a dot (like "./Makefile"), since the remake rules might be subtly
diff --git a/t/confh-subdir-clean.sh b/t/confh-subdir-clean.sh
index 7f28657d4..81e1b85bb 100644
--- a/t/confh-subdir-clean.sh
+++ b/t/confh-subdir-clean.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure config headers in subdirectories are cleaned.
diff --git a/t/confh.sh b/t/confh.sh
index 4ab770d6d..8400c2120 100644
--- a/t/confh.sh
+++ b/t/confh.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure config.h works in a subdir.
# Report from Alexandre Oliva.
diff --git a/t/confh4.sh b/t/confh4.sh
index 0ec5ee474..2a2f4c626 100644
--- a/t/confh4.sh
+++ b/t/confh4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR 34.
# > Description:
diff --git a/t/confh5.sh b/t/confh5.sh
index 4065a6077..74e2207b5 100644
--- a/t/confh5.sh
+++ b/t/confh5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we do not distribute header sources when they are built.
diff --git a/t/confh6.sh b/t/confh6.sh
index 37ed73ec9..4cf2b296c 100644
--- a/t/confh6.sh
+++ b/t/confh6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure config.h rule made even if it is in a subdir. The
# idea is that if config.h is in a subdir, and there is no Makefile in
diff --git a/t/confh7.sh b/t/confh7.sh
index ccb517fc6..3a5a9a03a 100644
--- a/t/confh7.sh
+++ b/t/confh7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure several config headers are allowed.
# See also sister "semantic" test 'confh8.sh'.
diff --git a/t/confh8.sh b/t/confh8.sh
index aa71b856d..9891bc97d 100644
--- a/t/confh8.sh
+++ b/t/confh8.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure several config headers are allowed.
# See also sister "minimalistic" test 'confh7.sh'.
diff --git a/t/configure.sh b/t/configure.sh
index ae1fd95c3..5f5924322 100644
--- a/t/configure.sh
+++ b/t/configure.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Diagnose if the autoconf input is named configure.in.
# Diagnose if both configure.in and configure.ac are present, prefer
diff --git a/t/confincl.sh b/t/confincl.sh
index ef52d599a..40cd93f94 100644
--- a/t/confincl.sh
+++ b/t/confincl.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# This tests for a bug reported by Gord Matzigkeit.
# If config.h is not used, @CONFIG_INCLUDE_SPEC@ should not appear
diff --git a/t/conflnk.sh b/t/conflnk.sh
index 7b10417f8..3ec22addc 100644
--- a/t/conflnk.sh
+++ b/t/conflnk.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure links created by AC_CONFIG_LINKS get removed with
# 'make distclean'
diff --git a/t/conflnk2.sh b/t/conflnk2.sh
index c9abb5948..0a7d43f38 100644
--- a/t/conflnk2.sh
+++ b/t/conflnk2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that sources for links created by AC_CONFIG_LINKS
# are distributed.
diff --git a/t/conflnk3.sh b/t/conflnk3.sh
index 254e610d1..9a5e230d5 100644
--- a/t/conflnk3.sh
+++ b/t/conflnk3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that AC_CONFIG_LINKS using a variable source
# is not broken.
diff --git a/t/conflnk4.sh b/t/conflnk4.sh
index 57c0de67f..06b16d60b 100644
--- a/t/conflnk4.sh
+++ b/t/conflnk4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure links to _identical files_ created by AC_CONFIG_LINKS get
# removed with 'make distclean' only if doing a VPATH build.
diff --git a/t/confsub.sh b/t/confsub.sh
index dbf8b34d0..0dab4a026 100644
--- a/t/confsub.sh
+++ b/t/confsub.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure config.h can be in subdir.
# Also, make sure config.h is properly rebuilt.
diff --git a/t/confvar.sh b/t/confvar.sh
index dbc351e28..84748d3b2 100644
--- a/t/confvar.sh
+++ b/t/confvar.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure configure_vars stuff works.
diff --git a/t/confvar2.sh b/t/confvar2.sh
index 45b374b71..d03dc64f0 100644
--- a/t/confvar2.sh
+++ b/t/confvar2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug reported by Jim Meyering.
diff --git a/t/copy.sh b/t/copy.sh
index a9437fb94..da446c706 100644
--- a/t/copy.sh
+++ b/t/copy.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure '-c' works. Report from Andris Pavenis.
# See also the much more in-depth test 'add-missing'.
diff --git a/t/cscope.tap b/t/cscope.tap
index d6f80c9aa..2461bcc67 100644
--- a/t/cscope.tap
+++ b/t/cscope.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test cscope functionality.
diff --git a/t/cscope2.sh b/t/cscope2.sh
index 8cb618eb4..2137cc9b9 100644
--- a/t/cscope2.sh
+++ b/t/cscope2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The 'cscope' target should not fail if there are no sources.
diff --git a/t/cscope3.sh b/t/cscope3.sh
index 2edcad0d9..0ec2a3194 100644
--- a/t/cscope3.sh
+++ b/t/cscope3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The 'cscope' target should not fail if there are no sources in a subdir.
# In practice this means 'cscope' should not be invoked if cscope.files
diff --git a/t/cxx-demo.sh b/t/cxx-demo.sh
index 1fb7e54eb..c3be764ab 100644
--- a/t/cxx-demo.sh
+++ b/t/cxx-demo.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Demo on C++ support.
diff --git a/t/cxx-lt-demo.sh b/t/cxx-lt-demo.sh
index 852cee76c..a6b401475 100644
--- a/t/cxx-lt-demo.sh
+++ b/t/cxx-lt-demo.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Demo on Libtool/C++ support.
diff --git a/t/cxx.sh b/t/cxx.sh
index d31a3ad54..528e2c74c 100644
--- a/t/cxx.sh
+++ b/t/cxx.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that '.c++' extension works.
# From Ralf Corsepius.
diff --git a/t/cxx2.sh b/t/cxx2.sh
index c97f6d48e..66b668208 100644
--- a/t/cxx2.sh
+++ b/t/cxx2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that Automake suggests using AC_PROG_CXX if C++ sources are used.
diff --git a/t/cxxcpp.sh b/t/cxxcpp.sh
index 7de24f78f..d4d692eb2 100644
--- a/t/cxxcpp.sh
+++ b/t/cxxcpp.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure automake sees AC_PROG_CXXCPP. From Garth Corral.
diff --git a/t/cxxlibobj.sh b/t/cxxlibobj.sh
index 9714d67e7..c6cbb02b4 100644
--- a/t/cxxlibobj.sh
+++ b/t/cxxlibobj.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure LIBOBJS and C++ sources work right.
diff --git a/t/cxxlink.sh b/t/cxxlink.sh
index b4ee5d8b5..de1d6ce20 100644
--- a/t/cxxlink.sh
+++ b/t/cxxlink.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure C++ linker is used when appropriate.
diff --git a/t/cxxnoc.sh b/t/cxxnoc.sh
index df2e6fe5d..32286371b 100644
--- a/t/cxxnoc.sh
+++ b/t/cxxnoc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure pure C++ sources don't include C-specific code.
diff --git a/t/cygnus-no-more.sh b/t/cygnus-no-more.sh
index ab2860e84..425283b81 100644
--- a/t/cygnus-no-more.sh
+++ b/t/cygnus-no-more.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that support for Cygnus-style trees is deprecated.
# That feature will be removed in the next major Automake release.
diff --git a/t/cygwin32.sh b/t/cygwin32.sh
index 2a144ab02..c45cfc46c 100644
--- a/t/cygwin32.sh
+++ b/t/cygwin32.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test basic Cygwin32 functionality.
diff --git a/t/dash.sh b/t/dash.sh
index 5df5e6adc..ccf6a81a6 100644
--- a/t/dash.sh
+++ b/t/dash.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure '-' can be used in path.
# Report from Matthew D. Langston.
diff --git a/t/defun.sh b/t/defun.sh
index ae7517df9..b91c93c8a 100644
--- a/t/defun.sh
+++ b/t/defun.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure aclocal picks up on all macro definitions.
diff --git a/t/defun2.sh b/t/defun2.sh
index b65c37005..711b8731d 100644
--- a/t/defun2.sh
+++ b/t/defun2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we don't mistake a macro definition for an invocation.
# From Jim Meyering.
diff --git a/t/dejagnu-absolute-builddir.sh b/t/dejagnu-absolute-builddir.sh
index 0961b3035..4b76d8c98 100644
--- a/t/dejagnu-absolute-builddir.sh
+++ b/t/dejagnu-absolute-builddir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that DejaGnu testsuites have 'objdir' defined (as a TCL variable)
# to an absolute path.
diff --git a/t/dejagnu-relative-srcdir.sh b/t/dejagnu-relative-srcdir.sh
index 0e6cdf1f4..2737efcd2 100644
--- a/t/dejagnu-relative-srcdir.sh
+++ b/t/dejagnu-relative-srcdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that DejaGnu testsuites have 'srcdir' defined to a relative path
# (both as TCL variable and as environment variable).
diff --git a/t/dejagnu-siteexp-append.sh b/t/dejagnu-siteexp-append.sh
index 1af3774f9..d25848f53 100644
--- a/t/dejagnu-siteexp-append.sh
+++ b/t/dejagnu-siteexp-append.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the files in $(EXTRA_DEJAGNU_SITE_CONFIG) get appended to
# site.exp in the same order in which they're listed in that variable.
diff --git a/t/dejagnu-siteexp-extend.sh b/t/dejagnu-siteexp-extend.sh
index d111f3c47..600dd0848 100644
--- a/t/dejagnu-siteexp-extend.sh
+++ b/t/dejagnu-siteexp-extend.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the developer can extend the site.exp generated by the
# automake-generated Makefile.
diff --git a/t/dejagnu-siteexp-useredit.sh b/t/dejagnu-siteexp-useredit.sh
index 6f3a75f08..b8d596641 100644
--- a/t/dejagnu-siteexp-useredit.sh
+++ b/t/dejagnu-siteexp-useredit.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the user can edit the Makefile-generated site.exp, and
# have its edits survive to the remaking of that file.
diff --git a/t/dejagnu.sh b/t/dejagnu.sh
index 563bae95f..94bd4be0f 100644
--- a/t/dejagnu.sh
+++ b/t/dejagnu.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Superficial test to check that dejagnu tests and automake-style
# tests can coexist. See also related deeper test 'check12.sh'.
diff --git a/t/dejagnu2.sh b/t/dejagnu2.sh
index f4088b666..ad5f83d4a 100644
--- a/t/dejagnu2.sh
+++ b/t/dejagnu2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we don't override the user's site.exp rule.
diff --git a/t/dejagnu3.sh b/t/dejagnu3.sh
index e0413aecb..18aefdd38 100644
--- a/t/dejagnu3.sh
+++ b/t/dejagnu3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the DejaGnu rules work for a simple program and test case.
diff --git a/t/dejagnu4.sh b/t/dejagnu4.sh
index 1ad535b1a..c94573ea3 100644
--- a/t/dejagnu4.sh
+++ b/t/dejagnu4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the DejaGnu rules work for a simple program and test case.
# Also check PR 488: Failure of the first of several tools tested.
diff --git a/t/dejagnu5.sh b/t/dejagnu5.sh
index 6da93b607..7cfab7022 100644
--- a/t/dejagnu5.sh
+++ b/t/dejagnu5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the DejaGnu rules do look for a testsuite named after
# the package by default.
diff --git a/t/dejagnu6.sh b/t/dejagnu6.sh
index 459874a11..889916d5d 100644
--- a/t/dejagnu6.sh
+++ b/t/dejagnu6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that "make check" fails, when a DejaGnu test fails.
diff --git a/t/dejagnu7.sh b/t/dejagnu7.sh
index ea4a30165..4ee57ddac 100644
--- a/t/dejagnu7.sh
+++ b/t/dejagnu7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that "make check" fails, when we invoke DejaGnu tests with --status
# (to detect TCL errors) on a file with TCL errors.
diff --git a/t/deleted-am.sh b/t/deleted-am.sh
index afcb1de01..696864ba9 100644
--- a/t/deleted-am.sh
+++ b/t/deleted-am.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The stub rules emitted to work around the "deleted header problem"
# for '.am' files shouldn't prevent the remake rules from correctly
diff --git a/t/deleted-m4.sh b/t/deleted-m4.sh
index a7b7e62a9..41b07d69c 100644
--- a/t/deleted-m4.sh
+++ b/t/deleted-m4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The stub rules emitted to work around the "deleted header problem"
# for '.m4' files shouldn't prevent the remake rules from correctly
diff --git a/t/depacl2.sh b/t/depacl2.sh
index 56690f58b..11d0cf9d1 100644
--- a/t/depacl2.sh
+++ b/t/depacl2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure dependencies work when required macro is part of
# autoconf.
diff --git a/t/depcomp-implicit-auxdir.sh b/t/depcomp-implicit-auxdir.sh
index 1281b19e6..33d52e386 100644
--- a/t/depcomp-implicit-auxdir.sh
+++ b/t/depcomp-implicit-auxdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure a top-level depcomp file is found when
# AC_CONFIG_AUX_DIR is not specified.
diff --git a/t/depcomp.sh b/t/depcomp.sh
index 5a5d5ba33..24425b912 100644
--- a/t/depcomp.sh
+++ b/t/depcomp.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure depcomp is installed and found properly
# when required for multiple directories.
diff --git a/t/depcomp2.sh b/t/depcomp2.sh
index 00c1f23fc..0ea91b854 100644
--- a/t/depcomp2.sh
+++ b/t/depcomp2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that depcomp is not used when it's not installed
# From Pavel Roskin.
diff --git a/t/depcomp8a.sh b/t/depcomp8a.sh
index 65127a7da..3b2a7c545 100644
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for regressions in computation of names of .Po files for
# automatic dependency tracking.
diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh
index 52894cc91..185ae9bf6 100644
--- a/t/depcomp8b.sh
+++ b/t/depcomp8b.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for regressions in computation of names of .Plo files for
# automatic dependency tracking.
diff --git a/t/depdist.sh b/t/depdist.sh
index 4a740c6b0..cc35bc710 100644
--- a/t/depdist.sh
+++ b/t/depdist.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure depcomp is found for the distribution.
# From Eric Magnien.
diff --git a/t/depend-postproc.sh b/t/depend-postproc.sh
index 9e20b057a..24f30a59f 100644
--- a/t/depend-postproc.sh
+++ b/t/depend-postproc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check to make sure we recognize a Makefile.in, even if post-processed
# and renamed. The particularly tricky code for automatic dependency
diff --git a/t/depend.sh b/t/depend.sh
index 4aa056b67..641741137 100644
--- a/t/depend.sh
+++ b/t/depend.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# This tests for a bug reported by Henrik Frystyk Nielsen
# In some cases the auto-dependency can get confused and try
diff --git a/t/depend3.sh b/t/depend3.sh
index 1d6f3ed8b..770a6e569 100644
--- a/t/depend3.sh
+++ b/t/depend3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test _DEPENDENCIES variable. From Lee Iverson.
diff --git a/t/depend4.sh b/t/depend4.sh
index 6e202357b..14d80f5e3 100644
--- a/t/depend4.sh
+++ b/t/depend4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that dependencies are included when there are many header files.
diff --git a/t/depend5.sh b/t/depend5.sh
index 7400e6144..ce0a70315 100644
--- a/t/depend5.sh
+++ b/t/depend5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that _AM_OUTPUT_DEPENDENCY_COMMANDS works with eval-style
# quoting in $CONFIG_FILES, done by newer Autoconf.
diff --git a/t/depend6.sh b/t/depend6.sh
index 0f3868530..6de2e3cf8 100644
--- a/t/depend6.sh
+++ b/t/depend6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check for _AM_OUTPUT_DEPENDENCY_COMMANDS grouping bug,
# reported by Markus Duft.
diff --git a/t/deprecated-acinit.sh b/t/deprecated-acinit.sh
index 45ec19e8f..e447dd122 100644
--- a/t/deprecated-acinit.sh
+++ b/t/deprecated-acinit.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that automake and autoconf complain about an old-style AC_INIT
# call used with a new-style AM_AUTOMAKE_INIT call.
diff --git a/t/destdir.sh b/t/destdir.sh
index 93c02a124..5323a1ee7 100644
--- a/t/destdir.sh
+++ b/t/destdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that 'make distcheck' can find some $(DESTDIR) omissions.
# PR/186.
diff --git a/t/dir-named-obj-is-bad.sh b/t/dir-named-obj-is-bad.sh
index c3e5a6c6c..602d4b48c 100644
--- a/t/dir-named-obj-is-bad.sh
+++ b/t/dir-named-obj-is-bad.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Naming a subdirectory 'obj/' is a bad idea. Automake should say so.
diff --git a/t/discover.sh b/t/discover.sh
index ab0866d2b..3159a975c 100644
--- a/t/discover.sh
+++ b/t/discover.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure LIBOBJS file cannot be mentioned explicitly.
diff --git a/t/dist-auxdir-many-subdirs.sh b/t/dist-auxdir-many-subdirs.sh
index bf11a46d3..486375fbe 100644
--- a/t/dist-auxdir-many-subdirs.sh
+++ b/t/dist-auxdir-many-subdirs.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# It should be legitimate for many subdir Makefiles to require the
# same config-aux files.
diff --git a/t/dist-auxfile-2.sh b/t/dist-auxfile-2.sh
index b977ee2a2..f9a60d7fa 100644
--- a/t/dist-auxfile-2.sh
+++ b/t/dist-auxfile-2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Files specified by AC_REQUIRE_AUX_FILE must exist, and if a Makefile
# is present in the build-aux directory, they correctly get automatically
diff --git a/t/dist-auxfile.sh b/t/dist-auxfile.sh
index fef805bd8..70adcae3d 100644
--- a/t/dist-auxfile.sh
+++ b/t/dist-auxfile.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Files specified by AC_REQUIRE_AUX_FILE must exist, and they get
# automatically distributed by the top-level Makefile.am.
diff --git a/t/dist-formats.tap b/t/dist-formats.tap
index a32fa211a..a597964c2 100644
--- a/t/dist-formats.tap
+++ b/t/dist-formats.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check support for different compression formats used by distribution
# archives.
diff --git a/t/dist-included-parent-dir.sh b/t/dist-included-parent-dir.sh
index b93cca06a..5ebb8f4bd 100644
--- a/t/dist-included-parent-dir.sh
+++ b/t/dist-included-parent-dir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure included files in parent directory are distributed.
diff --git a/t/dist-install-sh.sh b/t/dist-install-sh.sh
index 4d981527e..441982e7b 100644
--- a/t/dist-install-sh.sh
+++ b/t/dist-install-sh.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug where install-sh not included in distribution.
diff --git a/t/dist-lzma.sh b/t/dist-lzma.sh
index a18c3c720..d5da5a3e6 100644
--- a/t/dist-lzma.sh
+++ b/t/dist-lzma.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check support for no-dist-gzip with lzma.
diff --git a/t/dist-missing-am.sh b/t/dist-missing-am.sh
index 311de4bd4..7b564d6ef 100644
--- a/t/dist-missing-am.sh
+++ b/t/dist-missing-am.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The stub rules emitted to work around the "deleted header problem"
# for '.am' files shouldn't prevent "make" from diagnosing a missing
diff --git a/t/dist-missing-included-m4.sh b/t/dist-missing-included-m4.sh
index 4d2552311..0ba466873 100644
--- a/t/dist-missing-included-m4.sh
+++ b/t/dist-missing-included-m4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The stub rules emitted to work around the "deleted header problem"
# for '.m4' files shouldn't prevent "make" from diagnosing a missing
diff --git a/t/dist-missing-m4.sh b/t/dist-missing-m4.sh
index f54e14add..f6ee5bde6 100644
--- a/t/dist-missing-m4.sh
+++ b/t/dist-missing-m4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The stub rules emitted to work around the "deleted header problem"
# for '.m4' files shouldn't prevent "make" from diagnosing a missing
diff --git a/t/dist-pr109765.sh b/t/dist-pr109765.sh
index abdb47e78..031301bf4 100644
--- a/t/dist-pr109765.sh
+++ b/t/dist-pr109765.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Expose automake bug#10975: when several "dist-*" targets are invoked
# on the make command line, the first one ends up removing the distdir,
diff --git a/t/dist-readonly.sh b/t/dist-readonly.sh
index 9b9faa891..2b4124851 100644
--- a/t/dist-readonly.sh
+++ b/t/dist-readonly.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that a readonly files are distributed as such, and not make
# writable while being copied in the $(distdir).
diff --git a/t/dist-repeated.sh b/t/dist-repeated.sh
index 18e4271cf..2b9ee05f2 100644
--- a/t/dist-repeated.sh
+++ b/t/dist-repeated.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that we can distribute the same file as many times as we want.
# The distdir target should take care of not copying it more than one
diff --git a/t/dist-shar.sh b/t/dist-shar.sh
index f878cf1fd..b12caa2e5 100644
--- a/t/dist-shar.sh
+++ b/t/dist-shar.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Trying to use removed option 'dist-shar' should trigger a clear
# error message.
diff --git a/t/dist-tarZ.sh b/t/dist-tarZ.sh
index 98fecd2ee..0723c9297 100644
--- a/t/dist-tarZ.sh
+++ b/t/dist-tarZ.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Trying to use removed option 'dist-tarZ' should trigger a clear
# error message.
diff --git a/t/dist-with-unreadable-makefile-fails.sh b/t/dist-with-unreadable-makefile-fails.sh
index 269b8ca72..21fd10886 100644
--- a/t/dist-with-unreadable-makefile-fails.sh
+++ b/t/dist-with-unreadable-makefile-fails.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug in 'make dist'
# From Pavel Roskin.
diff --git a/t/distcheck-Tpo.sh b/t/distcheck-Tpo.sh
index 5091e9fd4..867df7809 100644
--- a/t/distcheck-Tpo.sh
+++ b/t/distcheck-Tpo.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure that the 'make distcheck'-run distcleancheck does not fail
# due to a leftover .deps/base.Tpo file when part of a successful build
diff --git a/t/distcheck-configure-flags-am.sh b/t/distcheck-configure-flags-am.sh
index df825e4bf..9d205d1ee 100644
--- a/t/distcheck-configure-flags-am.sh
+++ b/t/distcheck-configure-flags-am.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check support for AM_DISTCHECK_CONFIGURE_FLAGS at "make distcheck"
# time, and its interactions with DISTCHECK_CONFIGURE_FLAGS.
diff --git a/t/distcheck-configure-flags-subpkg.sh b/t/distcheck-configure-flags-subpkg.sh
index 64b34b9aa..e5bc8860b 100644
--- a/t/distcheck-configure-flags-subpkg.sh
+++ b/t/distcheck-configure-flags-subpkg.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check AM_DISTCHECK_CONFIGURE_FLAGS and DISTCHECK_CONFIGURE_FLAGS
# are not honored in a subpackage Makefile.am, but the flags from
diff --git a/t/distcheck-configure-flags.sh b/t/distcheck-configure-flags.sh
index 809189507..5ac12f034 100644
--- a/t/distcheck-configure-flags.sh
+++ b/t/distcheck-configure-flags.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check support for DISTCHECK_CONFIGURE_FLAGS at "make distcheck" time.
diff --git a/t/distcheck-hook.sh b/t/distcheck-hook.sh
index f519088a0..2174040d0 100644
--- a/t/distcheck-hook.sh
+++ b/t/distcheck-hook.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check basic support for distcheck-hook.
diff --git a/t/distcheck-hook2.sh b/t/distcheck-hook2.sh
index e060af07d..a1e304ca6 100644
--- a/t/distcheck-hook2.sh
+++ b/t/distcheck-hook2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that no 'distcheck-hook' target is created automatically by
# Automake, and that a used-defined 'distcheck-hook' is *not* honored
diff --git a/t/distcheck-missing-m4.sh b/t/distcheck-missing-m4.sh
index ad1a24786..c4e77e98c 100644
--- a/t/distcheck-missing-m4.sh
+++ b/t/distcheck-missing-m4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that we can define a distcheck-hook to diagnose m4 files
# missing from the dist tarball (interaction with '--install').
diff --git a/t/distcheck-no-prefix-or-srcdir-override.sh b/t/distcheck-no-prefix-or-srcdir-override.sh
index c99a7d98b..e143e1229 100644
--- a/t/distcheck-no-prefix-or-srcdir-override.sh
+++ b/t/distcheck-no-prefix-or-srcdir-override.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that "make distcheck" overrides any --srcdir or --prefix flag
# (mistakenly) defined in $(AM_DISTCHECK_CONFIGURE_FLAGS) or
diff --git a/t/distcheck-outdated-m4.sh b/t/distcheck-outdated-m4.sh
index 12591ce4f..a27e8d615 100644
--- a/t/distcheck-outdated-m4.sh
+++ b/t/distcheck-outdated-m4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that we can define a distcheck-hook to diagnose outdated m4
# files in a dist tarball (interaction with '--install').
diff --git a/t/distcheck-override-infodir.sh b/t/distcheck-override-infodir.sh
index efe5a9405..b895867a0 100644
--- a/t/distcheck-override-infodir.sh
+++ b/t/distcheck-override-infodir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that we can override ${infodir} while having distcheck still
# working. Related to automake bug#9579.
diff --git a/t/distcheck-pr10470.sh b/t/distcheck-pr10470.sh
index 5424d029f..15e0ee066 100644
--- a/t/distcheck-pr10470.sh
+++ b/t/distcheck-pr10470.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure "make distcheck" does not experience racy failures on
# systems (like MinGW/MSYS) that cannot remove a directory "in use"
diff --git a/t/distcheck-pr18286.sh b/t/distcheck-pr18286.sh
index 549ec22b7..49ec04840 100644
--- a/t/distcheck-pr18286.sh
+++ b/t/distcheck-pr18286.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure "make distcheck" detects all missing files, without getting
# confused by the fact that they exists in the "original" source tree
diff --git a/t/distcheck-pr9579.sh b/t/distcheck-pr9579.sh
index 2034f170d..886d3ef2c 100644
--- a/t/distcheck-pr9579.sh
+++ b/t/distcheck-pr9579.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check against automake bug#9579: distcheck does not always detect
# incomplete uninstall as advertised.
diff --git a/t/distcheck-writable-srcdir.sh b/t/distcheck-writable-srcdir.sh
index 523433738..6c1842f0c 100644
--- a/t/distcheck-writable-srcdir.sh
+++ b/t/distcheck-writable-srcdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the user abuse 'distcheck-hook' to ensure his packages
# is built by "make distcheck" with a writable srcdir. This goes
diff --git a/t/distcleancheck.sh b/t/distcleancheck.sh
index ed92e7795..2e565b56e 100644
--- a/t/distcleancheck.sh
+++ b/t/distcleancheck.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure the suggested 'distcleancheck_listfiles' in the manual works.
# The example Makefile.am we use is from the FAQ entry 'distcleancheck'.
diff --git a/t/distcom-subdir.sh b/t/distcom-subdir.sh
index 999400b24..500ddf046 100644
--- a/t/distcom-subdir.sh
+++ b/t/distcom-subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that if an auxfile (here depcomp) is required
# by a subdir Makefile.am, it is distributed by that Makefile.am.
diff --git a/t/distcom2.sh b/t/distcom2.sh
index 47895a919..7c7a9da25 100644
--- a/t/distcom2.sh
+++ b/t/distcom2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that depcomp and compile are added to DIST_COMMON.
# Report from Pavel Roskin. Report of problems with '--no-force' from
diff --git a/t/distcom3.sh b/t/distcom3.sh
index d4bc89516..04f0c5dba 100644
--- a/t/distcom3.sh
+++ b/t/distcom3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that non-existing common files are distributed
# if they are buildable.
diff --git a/t/distcom4.sh b/t/distcom4.sh
index 4c3fbeecd..ddfce3793 100644
--- a/t/distcom4.sh
+++ b/t/distcom4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure config files are distributed, and only once.
# This tries to distribute a file from a subdirectory, without
diff --git a/t/distcom5.sh b/t/distcom5.sh
index 6885c1758..09abe5d76 100644
--- a/t/distcom5.sh
+++ b/t/distcom5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure config files are distributed, and only once.
# This tries to distribute a file from a subdirectory, with
diff --git a/t/distdir.sh b/t/distdir.sh
index e1f8c411c..66c817fca 100644
--- a/t/distdir.sh
+++ b/t/distdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure subdirs in EXTRA_DIST work. Also tests to make
# sure *srcdir is properly handled. Note that using './', as in
diff --git a/t/disthook.sh b/t/disthook.sh
index 0c2cfdb25..d3d118500 100644
--- a/t/disthook.sh
+++ b/t/disthook.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that 'dist-hook' works. See automake bug#10878.
diff --git a/t/distlinks.sh b/t/distlinks.sh
index c87622837..7b6ba0eae 100644
--- a/t/distlinks.sh
+++ b/t/distlinks.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that distributed symlinks in the source tree will be expanded
# as regular files in $(distdir).
diff --git a/t/distlinksbrk.sh b/t/distlinksbrk.sh
index 39604e0ad..66b71a3ad 100644
--- a/t/distlinksbrk.sh
+++ b/t/distlinksbrk.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that distributed broken symlinks cause 'make dist' to fail, and
# to do so with (mostly) meaningful diagnostic.
diff --git a/t/distname.sh b/t/distname.sh
index 503e78208..355fd066d 100644
--- a/t/distname.sh
+++ b/t/distname.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test of names in tar file.
# From Rainer Orth.
diff --git a/t/dmalloc.sh b/t/dmalloc.sh
index ea7854de8..a297e0a46 100644
--- a/t/dmalloc.sh
+++ b/t/dmalloc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Simple checks on the 'AM_WITH_DMALLOC' macro.
diff --git a/t/doc-parsing-buglets-colneq-subst.sh b/t/doc-parsing-buglets-colneq-subst.sh
index 5d2dbb360..0f8dfe8de 100644
--- a/t/doc-parsing-buglets-colneq-subst.sh
+++ b/t/doc-parsing-buglets-colneq-subst.sh
@@ -12,14 +12,14 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check a documented limitation of the Automake's Makefile parser
# w.r.t. POSIX variable substitutions used in the name of targets.
# See Section "General Operation" in the Automake manual.
# If you cause some parts of this test to fail, chances are that you've
# improved the Automake parser ;-)
-# See:
+# See:
# or:
. test-init.sh
diff --git a/t/doc-parsing-buglets-tabs.sh b/t/doc-parsing-buglets-tabs.sh
index 190c9a95a..9e84f806d 100644
--- a/t/doc-parsing-buglets-tabs.sh
+++ b/t/doc-parsing-buglets-tabs.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check the documented limitation of the Automake's Makefile parser w.r.t.
# use of TAB characters; see Section "General Operation" in the Automake
diff --git a/t/dollar.sh b/t/dollar.sh
index 5910ad055..f9e0e026b 100644
--- a/t/dollar.sh
+++ b/t/dollar.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# We should support files with '$' characters in their names.
# Java people need this.
diff --git a/t/dollarvar.sh b/t/dollarvar.sh
index 720818b35..09d93d61f 100644
--- a/t/dollarvar.sh
+++ b/t/dollarvar.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that -Wportability complains about recursive
# variable expansions and variables containing '$', '$(...)', or
diff --git a/t/dollarvar2.sh b/t/dollarvar2.sh
index 80b03190b..1af16f9d3 100644
--- a/t/dollarvar2.sh
+++ b/t/dollarvar2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that -Wportability turns on portability-recursive,
# likewise for -Wno-...
diff --git a/t/double.sh b/t/double.sh
index 9b00e9e5d..9fd39bd29 100644
--- a/t/double.sh
+++ b/t/double.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure listing a program twice is ok.
# Report from Manu Rouat.
diff --git a/t/dup2.sh b/t/dup2.sh
index 537313028..cc0f92744 100644
--- a/t/dup2.sh
+++ b/t/dup2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure aclocal only warns about definitions overridden by acinclude.m4.
diff --git a/t/else.sh b/t/else.sh
index 4bf755d62..1205c1504 100644
--- a/t/else.sh
+++ b/t/else.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure line numbers are correct in some error reports.
diff --git a/t/empty-data-primary.sh b/t/empty-data-primary.sh
index c80fa0f2a..170a27bb6 100644
--- a/t/empty-data-primary.sh
+++ b/t/empty-data-primary.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug where if the list of installables is empty, invalid sh
# code is generated.
diff --git a/t/empty-sources-primary.tap b/t/empty-sources-primary.tap
index 36a20dd25..029625606 100644
--- a/t/empty-sources-primary.tap
+++ b/t/empty-sources-primary.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# A test for missing _SOURCES variable. Also test to make sure empty
# _SOURCES suppresses assumption about default name.
diff --git a/t/exdir.sh b/t/exdir.sh
index d34701dfd..778d0b70f 100644
--- a/t/exdir.sh
+++ b/t/exdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check to make sure new extended directory mechanism works.
diff --git a/t/exdir2.sh b/t/exdir2.sh
index 84ec535c6..39c1a3ba8 100644
--- a/t/exdir2.sh
+++ b/t/exdir2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure undefined directories are invalid.
diff --git a/t/exdir3.sh b/t/exdir3.sh
index 10accc04a..43a79ef23 100644
--- a/t/exdir3.sh
+++ b/t/exdir3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure pkgdatadir can be overridden via AC_SUBST.
diff --git a/t/exeext.sh b/t/exeext.sh
index 2df3b021b..eca03e502 100644
--- a/t/exeext.sh
+++ b/t/exeext.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure '.' in an exe name doesn't fool us.
# Report from Robert Collins.
diff --git a/t/exeext2.sh b/t/exeext2.sh
index 82700ac28..2ff0cd081 100644
--- a/t/exeext2.sh
+++ b/t/exeext2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure no-exeext option works.
diff --git a/t/exeext3.sh b/t/exeext3.sh
index 7a5d0e63c..be699473f 100644
--- a/t/exeext3.sh
+++ b/t/exeext3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we can override a program rule.
diff --git a/t/exeext4.sh b/t/exeext4.sh
index b3c1774fe..35b495d11 100644
--- a/t/exeext4.sh
+++ b/t/exeext4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure $(EXEEXT) is appended to programs and to tests that are
# programs, but not to @substitutions@.
diff --git a/t/ext.sh b/t/ext.sh
index 0b2435aab..23e1e0b5e 100644
--- a/t/ext.sh
+++ b/t/ext.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure extensions are set correctly for various languages.
diff --git a/t/ext2.sh b/t/ext2.sh
index 6e6580750..f1ed2fe22 100644
--- a/t/ext2.sh
+++ b/t/ext2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Regression test for a bug reported by Ladislav Strojil.
# Using different extensions for the same language should not
diff --git a/t/ext3.sh b/t/ext3.sh
index bfce9e6cf..6ff565bdf 100644
--- a/t/ext3.sh
+++ b/t/ext3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Cover corner cases of derive_suffix wrt. file extensions:
# - extension declared with SUFFIXES but with no suffix rule for it
diff --git a/t/extra-data.sh b/t/extra-data.sh
index b6614af43..054416ea1 100644
--- a/t/extra-data.sh
+++ b/t/extra-data.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Checks on the obsolete EXTRA_DATA variable.
diff --git a/t/extra-deps-lt.sh b/t/extra-deps-lt.sh
index 8f777366e..e3c8ba08f 100644
--- a/t/extra-deps-lt.sh
+++ b/t/extra-deps-lt.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test EXTRA_*_DEPENDENCIES, libtool version; see 'extra-deps.sh' for
# non-libtool variant.
diff --git a/t/extra-deps.sh b/t/extra-deps.sh
index 79a7a55ab..a36c7e712 100644
--- a/t/extra-deps.sh
+++ b/t/extra-deps.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test EXTRA_*_DEPENDENCIES. See 'extra-deps-lt.sh' for libtool variant.
diff --git a/t/extra-dist-dirs-and-subdirs.sh b/t/extra-dist-dirs-and-subdirs.sh
index d01007808..eb958a0d5 100644
--- a/t/extra-dist-dirs-and-subdirs.sh
+++ b/t/extra-dist-dirs-and-subdirs.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check to make sure EXTRA_DIST can contain a directory or
# a subdirectory, in $(builddir) or $(srcdir).
diff --git a/t/extra-dist-vpath-dir-merge.sh b/t/extra-dist-vpath-dir-merge.sh
index e0a2cc7bd..95095e575 100644
--- a/t/extra-dist-vpath-dir-merge.sh
+++ b/t/extra-dist-vpath-dir-merge.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check to make sure that when distdir is invoked in a VPATH
# configuration and has to distribute directory X, it actually merge
diff --git a/t/extra-dist-vpath-dir.sh b/t/extra-dist-vpath-dir.sh
index cfea384bb..bce2b44eb 100644
--- a/t/extra-dist-vpath-dir.sh
+++ b/t/extra-dist-vpath-dir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check to make sure EXTRA_DIST can contain a directory from $buildir.
# From Dean Povey.
diff --git a/t/extra-dist-wildcards-gnu.sh b/t/extra-dist-wildcards-gnu.sh
index 12bb2f699..a0536b8c4 100644
--- a/t/extra-dist-wildcards-gnu.sh
+++ b/t/extra-dist-wildcards-gnu.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check for more complex usage of wildcards in EXTRA_DIST.
# Suggested by observations from Braden McDaniel.
diff --git a/t/extra-dist-wildcards-vpath.sh b/t/extra-dist-wildcards-vpath.sh
index d1be5df31..f0be87e81 100644
--- a/t/extra-dist-wildcards-vpath.sh
+++ b/t/extra-dist-wildcards-vpath.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that wildcards in elements of EXTRA_DIST are honoured when
# $srcdir != $builddir, if properly declared.
diff --git a/t/extra-dist-wildcards.sh b/t/extra-dist-wildcards.sh
index f00a25f9b..4c44caa5b 100644
--- a/t/extra-dist-wildcards.sh
+++ b/t/extra-dist-wildcards.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that wildcards in EXTRA_DIST are honoured.
# Suggested by observations from Braden McDaniel.
diff --git a/t/extra-portability.sh b/t/extra-portability.sh
index 3e04f5f45..487513514 100644
--- a/t/extra-portability.sh
+++ b/t/extra-portability.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check interactions between the 'portability' and 'extra-portability'
# warning categories:
diff --git a/t/extra-portability2.sh b/t/extra-portability2.sh
index edcabf82b..dbb43fea5 100644
--- a/t/extra-portability2.sh
+++ b/t/extra-portability2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that extra-portability warnings are not enabled by --gnits,
# --gnu and --foreign.
diff --git a/t/extra-portability3.sh b/t/extra-portability3.sh
index 77680c663..0ea3e7ab4 100644
--- a/t/extra-portability3.sh
+++ b/t/extra-portability3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check interactions between the 'portability-recursive' and
# 'extra-portability' warning categories.
diff --git a/t/extra-programs-and-libs.sh b/t/extra-programs-and-libs.sh
index fe402a230..998643b68 100644
--- a/t/extra-programs-and-libs.sh
+++ b/t/extra-programs-and-libs.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure we warn about substitutions in bin_PROGRAMS if EXTRA_PROGRAMS
# are missing; but only if the former is not AC_SUBSTed itself
diff --git a/t/extra-programs-empty.sh b/t/extra-programs-empty.sh
index 9220ff718..5a7390857 100644
--- a/t/extra-programs-empty.sh
+++ b/t/extra-programs-empty.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that EXTRA_PROGRAMS doesn't get removed because it is empty.
# This check has been introduced in commit 'Release-1-9-254-g9d0eaef'
diff --git a/t/extra-programs-misc.sh b/t/extra-programs-misc.sh
index ca51a8751..a34a7cf9f 100644
--- a/t/extra-programs-misc.sh
+++ b/t/extra-programs-misc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure defining bin_PROGRAMS in terms of EXTRA_PROGRAMS works,
# and that referring to the same program with inconsistent addition
diff --git a/t/extra-sources-no-spurious.sh b/t/extra-sources-no-spurious.sh
index ccc15c631..cf4ff167f 100644
--- a/t/extra-sources-no-spurious.sh
+++ b/t/extra-sources-no-spurious.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check to make sure EXTRA_foo_SOURCES are not defined unnecessarily.
diff --git a/t/extra-sources.sh b/t/extra-sources.sh
index 51e5e55a1..db00e6a9e 100644
--- a/t/extra-sources.sh
+++ b/t/extra-sources.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure EXTRA_..._SOURCES actually works.
# Bug report from Henrik Frystyk Nielsen.
diff --git a/t/extra.sh b/t/extra.sh
index 28dbf0003..b67c0d756 100644
--- a/t/extra.sh
+++ b/t/extra.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure EXTRA_ targets are generated. This test used to
# make sure the targets were *not* generated. That is wrong; the
diff --git a/t/f90only.sh b/t/f90only.sh
index 73687f478..2f0c02ace 100644
--- a/t/f90only.sh
+++ b/t/f90only.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure programs with only Fortran 90 source are handled properly.
# (copied from 'fonly.sh') Mike Nolta
diff --git a/t/flavor.sh b/t/flavor.sh
index 2222d1acc..e6156994b 100644
--- a/t/flavor.sh
+++ b/t/flavor.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure flavors like 'cygnus', 'gnu', 'gnits' and command line
# options like '--ignore-deps' and '--silent-rules' are preserved across
diff --git a/t/flibs.sh b/t/flibs.sh
index 856931b88..c43f4f4ac 100644
--- a/t/flibs.sh
+++ b/t/flibs.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure 'AC_F77_LIBRARY_LDFLAGS' works properly.
# Matthew D. Langston
diff --git a/t/fn99.sh b/t/fn99.sh
index 15db5825e..8305d637f 100644
--- a/t/fn99.sh
+++ b/t/fn99.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check the filename-length-max=99 option.
diff --git a/t/fn99subdir.sh b/t/fn99subdir.sh
index 5754dcd6f..5d6c37c2d 100644
--- a/t/fn99subdir.sh
+++ b/t/fn99subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# PR 507: Check the filename-length-max=99 option
# in conjunction with AC_CONFIG_SUBDIRS.
diff --git a/t/fnoc.sh b/t/fnoc.sh
index 7d6f515d0..4672e37e2 100644
--- a/t/fnoc.sh
+++ b/t/fnoc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that pure Fortran 77 sources don't include
# C-specific code.
diff --git a/t/fonly.sh b/t/fonly.sh
index 2877f3ae9..de693e120 100644
--- a/t/fonly.sh
+++ b/t/fonly.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure programs with only Fortran 77 source are handled properly.
# Matthew D. Langston
diff --git a/t/forcemiss.sh b/t/forcemiss.sh
index d4c9c8ff2..8d9491231 100644
--- a/t/forcemiss.sh
+++ b/t/forcemiss.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that 'automake --force-missing' works.
diff --git a/t/forcemiss2.sh b/t/forcemiss2.sh
index 031a3cb58..5a9bbeff6 100644
--- a/t/forcemiss2.sh
+++ b/t/forcemiss2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that 'automake --force-missing' works, even with
# symlinked files.
diff --git a/t/fort1.sh b/t/fort1.sh
index ca45bdfdd..7a96934c8 100644
--- a/t/fort1.sh
+++ b/t/fort1.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that Automake suggests using AC_PROG_F77/FC if Fortran sources
# are used.
diff --git a/t/fort2.sh b/t/fort2.sh
index cc17aaefa..00728d360 100644
--- a/t/fort2.sh
+++ b/t/fort2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that AC_FC_SRCEXT(f9x) works as intended:
# - $(FCFLAGS_f) will be used
diff --git a/t/fort4.sh b/t/fort4.sh
index f850c8e0e..6f54b6466 100644
--- a/t/fort4.sh
+++ b/t/fort4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test mixing Fortran 77 and Fortran (FC).
diff --git a/t/fort5.sh b/t/fort5.sh
index 44cbb20fb..5f9ab8a61 100644
--- a/t/fort5.sh
+++ b/t/fort5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test mixing Fortran 77 and Fortran (FC), libtool version.
diff --git a/t/fortdep.sh b/t/fortdep.sh
index 2574a3f88..97015c740 100644
--- a/t/fortdep.sh
+++ b/t/fortdep.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure dependency tracking doesn't interfere with Fortran.
# For PR 75.
diff --git a/t/gcj.sh b/t/gcj.sh
index 20f4f015b..bbb287dbd 100644
--- a/t/gcj.sh
+++ b/t/gcj.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test of compiled java.
diff --git a/t/gcj2.sh b/t/gcj2.sh
index ab4ca67ba..5226947d5 100644
--- a/t/gcj2.sh
+++ b/t/gcj2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure '..' invalid in subdir .o's.
diff --git a/t/gcj3.sh b/t/gcj3.sh
index 24a1d20e2..2eaf135a1 100644
--- a/t/gcj3.sh
+++ b/t/gcj3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure dependency tracking works for java.
diff --git a/t/gcj4.sh b/t/gcj4.sh
index feb1547cb..0438d607c 100644
--- a/t/gcj4.sh
+++ b/t/gcj4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure dependency tracking works for Java.
diff --git a/t/gcj5.sh b/t/gcj5.sh
index 4a1d40ca4..d52590b6f 100644
--- a/t/gcj5.sh
+++ b/t/gcj5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure Automake suggests AM_PROG_GCJ when GCJ is needed.
diff --git a/t/gcj6.sh b/t/gcj6.sh
index b0d01ba23..9f80a2578 100644
--- a/t/gcj6.sh
+++ b/t/gcj6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# AM_PROG_GCJ should cause OBJEXT and EXEEXT to be set.
diff --git a/t/get-sysconf.sh b/t/get-sysconf.sh
index a768b4769..f2a4145e0 100644
--- a/t/get-sysconf.sh
+++ b/t/get-sysconf.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Dummy test case, aimed at reporting useful system information in the
# final 'test-suite.log'. This way, if a user experiences a failure in
diff --git a/t/gettext-basics.sh b/t/gettext-basics.sh
index 7ba1667a5..31cb346e1 100644
--- a/t/gettext-basics.sh
+++ b/t/gettext-basics.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check basic gettext support.
diff --git a/t/gettext-config-rpath.sh b/t/gettext-config-rpath.sh
index aaedd61a6..939182d7e 100644
--- a/t/gettext-config-rpath.sh
+++ b/t/gettext-config-rpath.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check the config.rpath requirement.
diff --git a/t/gettext-external-pr338.sh b/t/gettext-external-pr338.sh
index b4912eb5d..d1a60f0b4 100644
--- a/t/gettext-external-pr338.sh
+++ b/t/gettext-external-pr338.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check gettext 'external' support.
# PR/338, reported by Charles Wilson.
diff --git a/t/gettext-intl-subdir.sh b/t/gettext-intl-subdir.sh
index e55fffc12..7f3322eac 100644
--- a/t/gettext-intl-subdir.sh
+++ b/t/gettext-intl-subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check gettext 'AM_GNU_GETTEXT_INTL_SUBDIR' support.
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
index a8185af84..3f46945fa 100644
--- a/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Try to find the gettext '.m4' files and make them easily accessed
# to the test cases requiring them.
@@ -35,7 +35,7 @@ echo ACLOCAL_AMFLAGS = -I m4 >> Makefile.am
# Prefer autopoint to gettextize, since the latter unconditionally
# requires user interaction to complete; yes, this means confirmation
# from /dev/tty (!) -- see:
-#
+#
# We will need to specify the correct autopoint version in the
# AM_GNU_GETTEXT_VERSION call in configure.ac if we want autopoint to
diff --git a/t/gettext-pr381.sh b/t/gettext-pr381.sh
index a76d751f3..750765fb0 100644
--- a/t/gettext-pr381.sh
+++ b/t/gettext-pr381.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Automake gettext support: regression check for PR/381:
# 'SUBDIRS = po intl' must not be required if 'po/' doesn't exist.
diff --git a/t/gnits.sh b/t/gnits.sh
index fb1e8217b..f101f826a 100644
--- a/t/gnits.sh
+++ b/t/gnits.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to ensure --gnits version checking is correct.
diff --git a/t/gnits2.sh b/t/gnits2.sh
index c6a30ab0e..a5e4065b2 100644
--- a/t/gnits2.sh
+++ b/t/gnits2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to ensure std-options checking is correct.
diff --git a/t/gnits3.sh b/t/gnits3.sh
index a9748c7a3..5cb169cdd 100644
--- a/t/gnits3.sh
+++ b/t/gnits3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that AM_INSTALLCHECK_STD_OPTIONS_EXEMPT works.
diff --git a/t/gnumake.sh b/t/gnumake.sh
index b5502cc45..7ecd9717a 100644
--- a/t/gnumake.sh
+++ b/t/gnumake.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Automake should not assume that make files are called Makefile.
# Report from Braden McDaniel.
diff --git a/t/gnuwarn.sh b/t/gnuwarn.sh
index fbea36d3a..6ce9927d6 100644
--- a/t/gnuwarn.sh
+++ b/t/gnuwarn.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that Automake warns about user variables being overridden.
diff --git a/t/gnuwarn2.sh b/t/gnuwarn2.sh
index ebf6c09e7..c86dd38f5 100644
--- a/t/gnuwarn2.sh
+++ b/t/gnuwarn2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check diagnostics about no-installman being disallowed in 'gnu'.
diff --git a/t/hdr-vars-defined-once.sh b/t/hdr-vars-defined-once.sh
index 9f669033e..9dce441e4 100644
--- a/t/hdr-vars-defined-once.sh
+++ b/t/hdr-vars-defined-once.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure header vars defined only once when including.
# Report from Marcus G. Daniels.
diff --git a/t/header.sh b/t/header.sh
index 161d3acf9..a9b612b7c 100644
--- a/t/header.sh
+++ b/t/header.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR 68.
#
diff --git a/t/help-depend.sh b/t/help-depend.sh
index cc49fb08d..b777b7d44 100644
--- a/t/help-depend.sh
+++ b/t/help-depend.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that our private macro 'AM_DEP_TRACK' adds proper text to
# the configure help screen.
diff --git a/t/help-depend2.sh b/t/help-depend2.sh
index 60f64ca6e..b65ae07e8 100644
--- a/t/help-depend2.sh
+++ b/t/help-depend2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that when automake automatically activates support for
# dependency tracking, it adds proper text to the configure help screen.
diff --git a/t/help-dmalloc.sh b/t/help-dmalloc.sh
index 430a733de..e01edac44 100644
--- a/t/help-dmalloc.sh
+++ b/t/help-dmalloc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that our macro 'AM_WITH_DMALLOC' adds proper text to
# the configure help screen.
diff --git a/t/help-init.sh b/t/help-init.sh
index e20674aad..33305549f 100644
--- a/t/help-init.sh
+++ b/t/help-init.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that our grand macro 'AM_INIT_AUTOMAKE' add proper text
# to the configure help screen.
diff --git a/t/help-lispdir.sh b/t/help-lispdir.sh
index 9b9fdbc5f..228338f21 100644
--- a/t/help-lispdir.sh
+++ b/t/help-lispdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that our macro 'AM_PATH_LISPDIR' adds proper text to
# the configure help screen.
diff --git a/t/help-python.sh b/t/help-python.sh
index 643908128..78cdf3bfb 100644
--- a/t/help-python.sh
+++ b/t/help-python.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that macro 'AM_PATH_PYTHON' adds proper text to the
# configure help screen.
diff --git a/t/help-silent.sh b/t/help-silent.sh
index 0725fad66..2127d4f65 100644
--- a/t/help-silent.sh
+++ b/t/help-silent.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure configure options relative to automake silent rules are
# added to the configure help screen.
diff --git a/t/help-upc.sh b/t/help-upc.sh
index ed6678e77..e2f5e8daa 100644
--- a/t/help-upc.sh
+++ b/t/help-upc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that our macro 'AM_PROG_UPC' adds proper text to
# the configure help screen.
diff --git a/t/help.sh b/t/help.sh
index 7525b2602..f048cd96f 100644
--- a/t/help.sh
+++ b/t/help.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure --help and --version work, even when no configure.ac is in
# the current directory.
diff --git a/t/help2.sh b/t/help2.sh
index 4618f3aff..6b93448ab 100644
--- a/t/help2.sh
+++ b/t/help2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure --help and --version work, even when the current directory
# contains a broken configure.ac and a broken acinclude.m4.
diff --git a/t/help3.sh b/t/help3.sh
index 738aba8c0..9353ea629 100644
--- a/t/help3.sh
+++ b/t/help3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure --help and --version takes precedence over other options.
diff --git a/t/help4.sh b/t/help4.sh
index 61bbd448a..301dbd101 100644
--- a/t/help4.sh
+++ b/t/help4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the first among --help and --version to be specified on
# the command line takes precedence over the following one.
diff --git a/t/hfs.sh b/t/hfs.sh
index c29d4d9d3..6502c99e1 100644
--- a/t/hfs.sh
+++ b/t/hfs.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Automake should not think that ChangeLog == CHANGELOG on
diff --git a/t/implicit.sh b/t/implicit.sh
index a49b54e3a..b95a5a6fc 100644
--- a/t/implicit.sh
+++ b/t/implicit.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure implicit .o's are listed as appropriate. Report
# from Henrik Frystyk Nielsen.
diff --git a/t/includes-deprecation.sh b/t/includes-deprecation.sh
index da5300329..c46439710 100644
--- a/t/includes-deprecation.sh
+++ b/t/includes-deprecation.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Support for $(INCLUDES) is deprecated.
diff --git a/t/init.sh b/t/init.sh
index 25057f53d..180bd3344 100644
--- a/t/init.sh
+++ b/t/init.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we give a sensible error message when AC_INIT and
# AM_INIT_AUTOMAKE are both given less than two arguments.
diff --git a/t/init2.sh b/t/init2.sh
index 3e30e1b2c..24fbcef52 100644
--- a/t/init2.sh
+++ b/t/init2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we give a sensible error message when AM_INIT_AUTOMAKE
# contains junk.
diff --git a/t/install-info-dir.sh b/t/install-info-dir.sh
index ef3be1b48..f112e4281 100644
--- a/t/install-info-dir.sh
+++ b/t/install-info-dir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Checks on the 'install-info' target.
# Details about the individual checks' purposes and motivations are
diff --git a/t/install-sh-option-C.sh b/t/install-sh-option-C.sh
index 12880c0ad..b6bcb06fe 100644
--- a/t/install-sh-option-C.sh
+++ b/t/install-sh-option-C.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# More install-sh checks: check -C.
diff --git a/t/install-sh-unittests.sh b/t/install-sh-unittests.sh
index 17188e878..e97a1f3fa 100644
--- a/t/install-sh-unittests.sh
+++ b/t/install-sh-unittests.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Various install-sh checks.
diff --git a/t/installdir.sh b/t/installdir.sh
index cf8ab0bce..45d81aaea 100644
--- a/t/installdir.sh
+++ b/t/installdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR 203.
# See also automake bug#11030.
diff --git a/t/instdat.sh b/t/instdat.sh
index 53a959b96..6d766ad87 100644
--- a/t/instdat.sh
+++ b/t/instdat.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to see if defining INSTALL_DATA causes problems. From EGCS
# list.
diff --git a/t/instdat2.sh b/t/instdat2.sh
index 97862758c..0240b6412 100644
--- a/t/instdat2.sh
+++ b/t/instdat2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that installing under $exec_prefix is handled by install-exec.
# Testing with headers for instance.
diff --git a/t/instdir-cond.sh b/t/instdir-cond.sh
index fc6e3b700..f85e98c22 100644
--- a/t/instdir-cond.sh
+++ b/t/instdir-cond.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check against automake bug#10997: directories holding only
# conditionally-installed files should not be created unconditionally.
diff --git a/t/instdir-cond2.sh b/t/instdir-cond2.sh
index a3f09adcb..557d18a11 100644
--- a/t/instdir-cond2.sh
+++ b/t/instdir-cond2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check against automake bug#10997: directories holding only
# conditionally-installed files should not be created unconditionally.
diff --git a/t/instdir-java.sh b/t/instdir-java.sh
index 37a2c2221..8800b8562 100644
--- a/t/instdir-java.sh
+++ b/t/instdir-java.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# If $(javadir) is the empty string, then nothing should be installed there.
diff --git a/t/instdir-lisp.sh b/t/instdir-lisp.sh
index 0cee035ad..2f12c3442 100644
--- a/t/instdir-lisp.sh
+++ b/t/instdir-lisp.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# If $(lispdir) is the empty string, then nothing should be installed there.
diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh
index 91a27ee8d..414d1bc6a 100644
--- a/t/instdir-ltlib.sh
+++ b/t/instdir-ltlib.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# If $(libdir) or $(pyexecdir) is the empty string, then nothing should
# be installed there.
diff --git a/t/instdir-no-empty.sh b/t/instdir-no-empty.sh
index 0474070e8..a0f312bb9 100644
--- a/t/instdir-no-empty.sh
+++ b/t/instdir-no-empty.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# An empty "foo_PRIMARY" declaration should *not* cause "make install"
# to create directory $(foodir). See automake bug#10997 and bug#11030.
diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh
index 5c6db0f24..de55050b6 100644
--- a/t/instdir-prog.sh
+++ b/t/instdir-prog.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# If $(bindir), $(libdir) or $(pyexecdir) is the empty string, then
# nothing should be installed there.
diff --git a/t/instdir-python.sh b/t/instdir-python.sh
index 857937e72..5b46c4536 100644
--- a/t/instdir-python.sh
+++ b/t/instdir-python.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# If $(pythondir) is the empty string, then nothing should be installed there.
diff --git a/t/instdir-texi.sh b/t/instdir-texi.sh
index 3382cbd1d..c00772124 100644
--- a/t/instdir-texi.sh
+++ b/t/instdir-texi.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# If $(infodir) is the empty string, then nothing should be installed there.
# Likewise for the other install-* targets used for texinfo files.
diff --git a/t/instdir.sh b/t/instdir.sh
index 786e5d866..e29167d61 100644
--- a/t/instdir.sh
+++ b/t/instdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# If $(foodir) is the empty string, then nothing should be installed there.
# This test only ensures this if $(foo_PRIMARY) is also empty, see
diff --git a/t/instdir2.sh b/t/instdir2.sh
index 0c3acf253..80bc99d85 100644
--- a/t/instdir2.sh
+++ b/t/instdir2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# If $(foodir) is the empty string, then nothing should be installed there.
# This test ensures this also if $(foo_PRIMARY) is nonempty, see
diff --git a/t/instexec.sh b/t/instexec.sh
index 9fbfe535f..0d61664ef 100644
--- a/t/instexec.sh
+++ b/t/instexec.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for this bug: when a Makefile.am builds nothing, no
# install-exec target is generated.
diff --git a/t/instfail-info.sh b/t/instfail-info.sh
index efea06335..31326a786 100644
--- a/t/instfail-info.sh
+++ b/t/instfail-info.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The install rule should honor failures of the install program.
# Some of these are already caught by 'instmany.sh'.
diff --git a/t/instfail-java.sh b/t/instfail-java.sh
index 55b9912cd..360c685a0 100644
--- a/t/instfail-java.sh
+++ b/t/instfail-java.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The install rule should honor failures of the install program.
# Some of these are already caught by 'instmany.sh'.
diff --git a/t/instfail-libtool.sh b/t/instfail-libtool.sh
index 9e48c53fd..39946f763 100644
--- a/t/instfail-libtool.sh
+++ b/t/instfail-libtool.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The install rule should honor failures of the install program.
# Some of these are already caught by 'instmany.sh'.
diff --git a/t/instfail.sh b/t/instfail.sh
index 99ea0632e..5efc754b8 100644
--- a/t/instfail.sh
+++ b/t/instfail.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The install rule should honor failures of the install program.
# Some of these are already caught by 'instmany.sh'.
diff --git a/t/insthook.sh b/t/insthook.sh
index 69a050237..103577260 100644
--- a/t/insthook.sh
+++ b/t/insthook.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure the install-exec-hook example we give in the manual works.
diff --git a/t/instman.sh b/t/instman.sh
index ed0f71d52..3f31835f1 100644
--- a/t/instman.sh
+++ b/t/instman.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure the MKDIR_P invocation is correct in install-man
# target. Bug reported by Gordon Irlam .
diff --git a/t/instman2.sh b/t/instman2.sh
index 2807c77a4..09a087e69 100644
--- a/t/instman2.sh
+++ b/t/instman2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure mkinstalldirs invocation correct in install-man
# target. Bug reported by Gordon Irlam .
diff --git a/t/instmany-mans.sh b/t/instmany-mans.sh
index ae16f95f4..08a66dabd 100644
--- a/t/instmany-mans.sh
+++ b/t/instmany-mans.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Installing many files should not exceed the command line length limit.
diff --git a/t/instmany-python.sh b/t/instmany-python.sh
index 2fa5262e8..542251b97 100644
--- a/t/instmany-python.sh
+++ b/t/instmany-python.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Installing many files should not exceed the command line length limit.
diff --git a/t/instmany.sh b/t/instmany.sh
index 6a6cacb10..7bb92d2b9 100644
--- a/t/instmany.sh
+++ b/t/instmany.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Installing many files should not exceed the command line length limit.
# Here, the main issue is that we may prepend '$(srcdir)/' to each file,
diff --git a/t/instspc.tap b/t/instspc.tap
index fa07163df..01ef38bd9 100644
--- a/t/instspc.tap
+++ b/t/instspc.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that building from, or installing to, directories with shell
# metacharacters succeed.
diff --git a/t/interp.sh b/t/interp.sh
index 1af6f4616..992083812 100644
--- a/t/interp.sh
+++ b/t/interp.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure variable interpolation works.
diff --git a/t/interp2.sh b/t/interp2.sh
index 94d84e076..5b543f276 100644
--- a/t/interp2.sh
+++ b/t/interp2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure variable interpolation doesn't break other
# features. Report from Joel N. Weber, II.
diff --git a/t/java-check.sh b/t/java-check.sh
index 83c93a9d8..ae2ef54ed 100644
--- a/t/java-check.sh
+++ b/t/java-check.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that check_JAVA causes *.class files to be built only with
# "make check", and not also with "make all".
diff --git a/t/java-clean.sh b/t/java-clean.sh
index eaa54510f..1d82de801 100644
--- a/t/java-clean.sh
+++ b/t/java-clean.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test cleaning of Java class files and timestamps.
diff --git a/t/java-compile-install.sh b/t/java-compile-install.sh
index 8b5416d70..4956aeee4 100644
--- a/t/java-compile-install.sh
+++ b/t/java-compile-install.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test on compilation and installation of Java class files.
diff --git a/t/java-compile-run-flat.sh b/t/java-compile-run-flat.sh
index 4a7099a98..1f74a3c62 100644
--- a/t/java-compile-run-flat.sh
+++ b/t/java-compile-run-flat.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test on compilation and execution of Java class files.
# Also meddle with wrapper scripts, as would be probably seen in a real
diff --git a/t/java-compile-run-nested.sh b/t/java-compile-run-nested.sh
index 20e3f8777..788b584fe 100644
--- a/t/java-compile-run-nested.sh
+++ b/t/java-compile-run-nested.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test on compilation and execution of Java class files.
# Also meddle with wrapper scripts, as would be probably seen in a real
diff --git a/t/java-empty-classpath.sh b/t/java-empty-classpath.sh
index a213eaa68..68f1ce4be 100644
--- a/t/java-empty-classpath.sh
+++ b/t/java-empty-classpath.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Java compilation works also when CLASSPATH is unset or empty at
# compilation time. See automake bug#9306.
diff --git a/t/java-extra.sh b/t/java-extra.sh
index a749dd8b8..22b07d012 100644
--- a/t/java-extra.sh
+++ b/t/java-extra.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check use of EXTRA with the JAVA primary. Also test interaction
# of JAVA with conditionals (it's natural to test it here, since
diff --git a/t/java-mix.sh b/t/java-mix.sh
index e3cf463e1..011c08b29 100644
--- a/t/java-mix.sh
+++ b/t/java-mix.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the JAVA primary can be used freely in the same Makefile.am
# with proper combinations of the 'dist_', 'nodist_' and 'nobase_'
diff --git a/t/java-no-duplicate.sh b/t/java-no-duplicate.sh
index 5121ae698..cac0c20e2 100644
--- a/t/java-no-duplicate.sh
+++ b/t/java-no-duplicate.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that some Java-related variables and rules are not repeatedly
# defined.
diff --git a/t/java-nobase.sh b/t/java-nobase.sh
index 1c720bf78..8673675a1 100644
--- a/t/java-nobase.sh
+++ b/t/java-nobase.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test support of 'nobase_' with the 'JAVA' primary.
diff --git a/t/java-noinst.sh b/t/java-noinst.sh
index 911d83126..d0075b158 100644
--- a/t/java-noinst.sh
+++ b/t/java-noinst.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that noinst_JAVA causes generated *.class files not to
# be installed.
diff --git a/t/java-rebuild.sh b/t/java-rebuild.sh
index 2567cf0f5..3f10a6499 100644
--- a/t/java-rebuild.sh
+++ b/t/java-rebuild.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test rebuild rules for Java class files.
diff --git a/t/java-sources.sh b/t/java-sources.sh
index 5d376bceb..d7dbcb2ca 100644
--- a/t/java-sources.sh
+++ b/t/java-sources.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test definition of automake-generated private Makefile variable
# '$(am__java_sources)'.
diff --git a/t/java-uninstall.sh b/t/java-uninstall.sh
index c38072276..3e79050eb 100644
--- a/t/java-uninstall.sh
+++ b/t/java-uninstall.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check uninstallation of Java class files.
diff --git a/t/java.sh b/t/java.sh
index f35bed292..6fad13bab 100644
--- a/t/java.sh
+++ b/t/java.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Minimal test of Java functionality.
diff --git a/t/java2.sh b/t/java2.sh
index 9c80e7957..626ad6eaa 100644
--- a/t/java2.sh
+++ b/t/java2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that Java rules doesn't attempt to run javac when there is
# no classes to compile.
diff --git a/t/java3.sh b/t/java3.sh
index 88cca6567..b7d1f1968 100644
--- a/t/java3.sh
+++ b/t/java3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that Java rules don't attempt to compile or install
# *.java files when there are none.
diff --git a/t/javadir-undefined.sh b/t/javadir-undefined.sh
index af919e47c..e5285470f 100644
--- a/t/javadir-undefined.sh
+++ b/t/javadir-undefined.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Use of JAVA primary should not allow the use of the 'java_' prefix
# when $(javadir) is undefined. Otherwise, we could silently end up
diff --git a/t/javaflags.sh b/t/javaflags.sh
index a10c3b920..1d8e0b7ae 100644
--- a/t/javaflags.sh
+++ b/t/javaflags.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check support for $(JAVACFLAGS) and $(AM_JAVACFLAGS).
diff --git a/t/javaprim.sh b/t/javaprim.sh
index 939703800..857e41e8f 100644
--- a/t/javaprim.sh
+++ b/t/javaprim.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure JAVA variable can be defined by AC_SUBST.
diff --git a/t/javasubst.sh b/t/javasubst.sh
index 5962b0066..c761a8fae 100644
--- a/t/javasubst.sh
+++ b/t/javasubst.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure redefining JAVAC with AC_SUBST works.
diff --git a/t/ldadd.sh b/t/ldadd.sh
index 66e3c6c6c..3083fc381 100644
--- a/t/ldadd.sh
+++ b/t/ldadd.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check to make sure incorrect LDADD usage is diagnosed.
diff --git a/t/ldflags.sh b/t/ldflags.sh
index 10a282daf..68dc553e9 100644
--- a/t/ldflags.sh
+++ b/t/ldflags.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check for LDFLAGS in conditional.
# PR 77.
diff --git a/t/lex-clean-cxx.sh b/t/lex-clean-cxx.sh
index 2c90b18f2..10749dcc4 100644
--- a/t/lex-clean-cxx.sh
+++ b/t/lex-clean-cxx.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that C++ source files derived from non-distributed Lex sources
# are cleaned by "make clean", while C++ source files derived from
diff --git a/t/lex-clean.sh b/t/lex-clean.sh
index 376b323e3..c32c2f2da 100644
--- a/t/lex-clean.sh
+++ b/t/lex-clean.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that .c files derived from non-distributed .l sources
# are cleaned by "make clean", while .c files derived from
diff --git a/t/lex-depend-cxx.sh b/t/lex-depend-cxx.sh
index a20890872..b9fad4696 100644
--- a/t/lex-depend-cxx.sh
+++ b/t/lex-depend-cxx.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure dependencies work with Lex/C++.
# Test synthesized from PR automake/6.
diff --git a/t/lex-depend-grep.sh b/t/lex-depend-grep.sh
index 81e61bae8..a6453bab7 100644
--- a/t/lex-depend-grep.sh
+++ b/t/lex-depend-grep.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure dependencies for Lex and C/C++ does not break
# in obvious ways. See PR automake/6, and related semantic tests
diff --git a/t/lex-depend.sh b/t/lex-depend.sh
index 587b6bec4..e181af25f 100644
--- a/t/lex-depend.sh
+++ b/t/lex-depend.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure automatic dependency tracking work with Lex/C.
# Test suggested by PR automake/6.
diff --git a/t/lex-header.sh b/t/lex-header.sh
index 01495ddc7..d0810c7d3 100644
--- a/t/lex-header.sh
+++ b/t/lex-header.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Automake lex support can work with flex '--header-file' option (see
# bugs #8844 and #9933).
diff --git a/t/lex-lib-external.sh b/t/lex-lib-external.sh
index a83fbb5c8..902bedc95 100644
--- a/t/lex-lib-external.sh
+++ b/t/lex-lib-external.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that we can get use the 'yywrap' function from a system-wide
# library, if that's available.
diff --git a/t/lex-lib.sh b/t/lex-lib.sh
index e0f845b3f..b0bdd904b 100644
--- a/t/lex-lib.sh
+++ b/t/lex-lib.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that we can provide a personal 'yywrap' function in a custom
# library.
diff --git a/t/lex-libobj.sh b/t/lex-libobj.sh
index 631080a56..2d4fe5916 100644
--- a/t/lex-libobj.sh
+++ b/t/lex-libobj.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that we can provide a personal 'yywrap' function through the
# LIBOBJ machinery.
diff --git a/t/lex-line.sh b/t/lex-line.sh
index 8b85dd26d..93997de4a 100644
--- a/t/lex-line.sh
+++ b/t/lex-line.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that automake lex support ensures that lex-generated C
# files use correct "#line" directives.
diff --git a/t/lex-multiple.sh b/t/lex-multiple.sh
index f05356c17..5d6d74c26 100644
--- a/t/lex-multiple.sh
+++ b/t/lex-multiple.sh
@@ -12,13 +12,13 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that we can build a program using several lexers at once
# (assuming Flex is used). That is a little tricky, but possible.
# See:
-#
-#
+#
+#
required='cc flex'
. test-init.sh
diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh
index 7ad6b4272..5cadcff0c 100644
--- a/t/lex-nodist.sh
+++ b/t/lex-nodist.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Checks for .c files derived from non-distributed .l sources.
# The test 'lex-pr204.sh' does similar check with AM_MAINTAINER_MODE
diff --git a/t/lex-noyywrap.sh b/t/lex-noyywrap.sh
index c928738a8..dbbf8590a 100644
--- a/t/lex-noyywrap.sh
+++ b/t/lex-noyywrap.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check Lex support with flex using the '%noyywrap' option.
diff --git a/t/lex-pr204.sh b/t/lex-pr204.sh
index c873a11eb..e388353e8 100644
--- a/t/lex-pr204.sh
+++ b/t/lex-pr204.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Related to PR 204.
# C sources derived from nodist_ lex sources should not be distributed.
diff --git a/t/lex-subobj-nodep.sh b/t/lex-subobj-nodep.sh
index d6900bb43..4f79ce047 100644
--- a/t/lex-subobj-nodep.sh
+++ b/t/lex-subobj-nodep.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure subdirs for subdir scanners are generated when subdir-objects
# are used, even when dependency tracking is disabled.
diff --git a/t/lex.sh b/t/lex.sh
index 6f63e24ab..94b11bc9c 100644
--- a/t/lex.sh
+++ b/t/lex.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
. test-init.sh
diff --git a/t/lex2.sh b/t/lex2.sh
index 1d72ccdf7..e9c4665bf 100644
--- a/t/lex2.sh
+++ b/t/lex2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that Automake suggest using AM_PROG_LEX when a lexer is used.
diff --git a/t/lex3.sh b/t/lex3.sh
index b737eae41..9f1737a78 100644
--- a/t/lex3.sh
+++ b/t/lex3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Basic semantic checks on Lex support.
# Test associated with PR 19.
diff --git a/t/lex5.sh b/t/lex5.sh
index ac35f7e1d..ed20ef76f 100644
--- a/t/lex5.sh
+++ b/t/lex5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for subdir lexers.
diff --git a/t/lexcpp.sh b/t/lexcpp.sh
index 20b5058d1..a639b964b 100644
--- a/t/lexcpp.sh
+++ b/t/lexcpp.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure Lex + C++ is supported.
# Please keep this is sync with sister test 'yaccpp.sh'.
diff --git a/t/lexvpath.sh b/t/lexvpath.sh
index 23f884d22..927d655ec 100644
--- a/t/lexvpath.sh
+++ b/t/lexvpath.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# This test checks that dependent files are updated before including
# in the distribution. 'lexer.c' depends on 'lexer.l'. The latter is
diff --git a/t/lflags-cxx.sh b/t/lflags-cxx.sh
index 9a225846f..72231e722 100644
--- a/t/lflags-cxx.sh
+++ b/t/lflags-cxx.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that $(LFLAGS) takes precedence over both $(AM_LFLAGS) and
# $(foo_LFLAGS). This is the C++ case.
diff --git a/t/lflags.sh b/t/lflags.sh
index ebbc8e70a..fefd9cc55 100644
--- a/t/lflags.sh
+++ b/t/lflags.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that $(LFLAGS) takes precedence over both $(AM_LFLAGS) and
# $(foo_LFLAGS).
diff --git a/t/libexec.sh b/t/libexec.sh
index 715a3ce6e..fdb63ae7b 100644
--- a/t/libexec.sh
+++ b/t/libexec.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# PROGRAMS and LIBRARIES can be installed in (pkg)libexecdir.
diff --git a/t/libobj-basic.sh b/t/libobj-basic.sh
index 76a836ab0..686888d22 100644
--- a/t/libobj-basic.sh
+++ b/t/libobj-basic.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure AC_LIBSOURCE and AC_LIBSOURCES work.
diff --git a/t/libobj-no-dependency-tracking.sh b/t/libobj-no-dependency-tracking.sh
index 1f024057e..793b56f9e 100644
--- a/t/libobj-no-dependency-tracking.sh
+++ b/t/libobj-no-dependency-tracking.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure that LIBOBJS source files are properly built without dependency
# tracking when using out of tree builds.
diff --git a/t/libobj10.sh b/t/libobj10.sh
index efccca181..5c10e4aa0 100644
--- a/t/libobj10.sh
+++ b/t/libobj10.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Do not complain about the nonexistence of a source for LIBOBJS if
# it's in BUILT_SOURCES. Reported by Erez Zadok.
diff --git a/t/libobj12.sh b/t/libobj12.sh
index e124b6cd4..6b1a537b5 100644
--- a/t/libobj12.sh
+++ b/t/libobj12.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test if a file can be mentioned in LIBOBJS and explicitly.
# (See libobj13.sh for the LTLIBRARIES check.)
diff --git a/t/libobj13.sh b/t/libobj13.sh
index 4e4a4e867..8483f1553 100644
--- a/t/libobj13.sh
+++ b/t/libobj13.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test if a file can be mentioned in LTLIBOBJS and explicitly.
# (Like libobj12.sh, but for Libtool libraries.)
diff --git a/t/libobj14.sh b/t/libobj14.sh
index c02e9e039..10f101ed8 100644
--- a/t/libobj14.sh
+++ b/t/libobj14.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Regression test for an internal error when @LIBOBJS@ is used in
# a variable that is not defined in the same conditions as the _LDADD
diff --git a/t/libobj15a.sh b/t/libobj15a.sh
index a38d76e91..28f0552ca 100644
--- a/t/libobj15a.sh
+++ b/t/libobj15a.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Nonexistent sources for AC_LIBOBJ should cause an Automake failure.
diff --git a/t/libobj15b.sh b/t/libobj15b.sh
index ed35da768..4f939eec6 100644
--- a/t/libobj15b.sh
+++ b/t/libobj15b.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Nonexistent source for AC_LIBSOURCE should cause Automake to fail.
@@ -24,7 +24,7 @@ AM_PROG_AR
AC_PROG_RANLIB
AC_LIBSOURCE([foobar.c])
# NOTE: this call to AC_OUTPUT is really needed; see Automake bug #7635
-#
+#
AC_OUTPUT
END
diff --git a/t/libobj15c.sh b/t/libobj15c.sh
index 70388a3c6..b03451335 100644
--- a/t/libobj15c.sh
+++ b/t/libobj15c.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Nonexistent sources for AC_LIBSOURCES should cause Automake to fail.
@@ -23,7 +23,7 @@ AC_PROG_CC
AC_PROG_RANLIB
AC_LIBSOURCES([foobar.c, bazquux.c])
# NOTE: this call to AC_OUTPUT is really needed; see Automake bug #7635
-#
+#
AC_OUTPUT
END
diff --git a/t/libobj16a.sh b/t/libobj16a.sh
index 82ecb93c0..dcd46666f 100644
--- a/t/libobj16a.sh
+++ b/t/libobj16a.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure AC_LIBOBJ and friends work.
# Please keep this in sync with sister test 'libobj16b.sh'.
diff --git a/t/libobj16b.sh b/t/libobj16b.sh
index a020200d5..be1d32829 100644
--- a/t/libobj16b.sh
+++ b/t/libobj16b.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure AC_LIBOBJ and friends work.
# Please keep this in sync with sister test 'libobj16a.sh'.
diff --git a/t/libobj17.sh b/t/libobj17.sh
index 769c99b79..85e84d597 100644
--- a/t/libobj17.sh
+++ b/t/libobj17.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure AC_LIBOBJ accept non-literal arguments.
diff --git a/t/libobj18.sh b/t/libobj18.sh
index 275f403f5..c920b071b 100644
--- a/t/libobj18.sh
+++ b/t/libobj18.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure AC_LIBSOURCE and AC_LIBSOURCES use arguments literally.
diff --git a/t/libobj19.sh b/t/libobj19.sh
index 0b679fab9..21ce31e50 100644
--- a/t/libobj19.sh
+++ b/t/libobj19.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test support for AC_CONFIG_LIBOBJ_DIR.
diff --git a/t/libobj2.sh b/t/libobj2.sh
index 3c736882a..c52ae31a5 100644
--- a/t/libobj2.sh
+++ b/t/libobj2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure LIBOBJS works in subdirs.
# Bug from Josh MacDonald.
diff --git a/t/libobj20a.sh b/t/libobj20a.sh
index 39428eaa6..b07a6bb3c 100644
--- a/t/libobj20a.sh
+++ b/t/libobj20a.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test error reporting for AC_CONFIG_LIBOBJ_DIR.
# See also sister tests 'libobj20b.sh' and 'libobj20c.sh'.
diff --git a/t/libobj20b.sh b/t/libobj20b.sh
index 17204aa1d..c70dfb8bf 100644
--- a/t/libobj20b.sh
+++ b/t/libobj20b.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test error reporting for AC_CONFIG_LIBOBJ_DIR.
# See also sister test 'libobj20c.sh'.
@@ -26,7 +26,7 @@ AM_PROG_AR
AC_PROG_RANLIB
AC_LIBSOURCE([foobar.c])
# NOTE: this call to AC_OUTPUT is really needed; see Automake bug #7635
-#
+#
AC_OUTPUT
END
diff --git a/t/libobj20c.sh b/t/libobj20c.sh
index eb5d77c64..c8200d8b9 100644
--- a/t/libobj20c.sh
+++ b/t/libobj20c.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test error reporting for AC_CONFIG_LIBOBJ_DIR.
# See also sister test 'libobj20b.sh'.
diff --git a/t/libobj3.sh b/t/libobj3.sh
index d92a4f14d..2d0e6b017 100644
--- a/t/libobj3.sh
+++ b/t/libobj3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we complain if @LIBOBJS@ is used without being set in
# configure.ac.
diff --git a/t/libobj4.sh b/t/libobj4.sh
index 8a5b8f518..daefa43bb 100644
--- a/t/libobj4.sh
+++ b/t/libobj4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure LIBOBJS error only occurs if LIBOBJS seen. Report
# from Jim Meyering.
diff --git a/t/libobj5.sh b/t/libobj5.sh
index 1e9750221..e5769e372 100644
--- a/t/libobj5.sh
+++ b/t/libobj5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure AC_REPLACE_FUNCS works across lines. Report from
# Jim Meyering.
diff --git a/t/libobj7.sh b/t/libobj7.sh
index b2eaa38fe..0ec302e81 100644
--- a/t/libobj7.sh
+++ b/t/libobj7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for multiple replacement functions.
diff --git a/t/library.sh b/t/library.sh
index 454f66b5c..1d0e487d3 100644
--- a/t/library.sh
+++ b/t/library.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for _DEPENDENCIES with libraries.
diff --git a/t/library2.sh b/t/library2.sh
index 568523518..72eae1f83 100644
--- a/t/library2.sh
+++ b/t/library2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure Automake suggest using AC_PROG_RANLIB when *_LIBRARIES is used.
diff --git a/t/library3.sh b/t/library3.sh
index 069bfca92..2068c101f 100644
--- a/t/library3.sh
+++ b/t/library3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure Automake simplify conditions in diagnostics.
diff --git a/t/libtoo10.sh b/t/libtoo10.sh
index d7568359f..ddc83b6c0 100644
--- a/t/libtoo10.sh
+++ b/t/libtoo10.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure .libs directories are removed for _PROGRAMS.
# Report from Guillermo Ontañón.
diff --git a/t/libtoo11.sh b/t/libtoo11.sh
index a281ab949..900b3bec6 100644
--- a/t/libtoo11.sh
+++ b/t/libtoo11.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure config.lt is removed with Libtool 2.2.x's LT_OUTPUT.
# Report by Charles Wilson.
diff --git a/t/libtool-macros.sh b/t/libtool-macros.sh
index 5030de699..637adb402 100644
--- a/t/libtool-macros.sh
+++ b/t/libtool-macros.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Try to find the libtool '.m4' files and make them easily accessed
# to the test cases requiring them.
diff --git a/t/libtool.sh b/t/libtool.sh
index 4bc0d9a94..eab01f037 100644
--- a/t/libtool.sh
+++ b/t/libtool.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure libtool is removed.
# Report from Kevin Dalley.
diff --git a/t/libtool2.sh b/t/libtool2.sh
index f41316b26..a14cae019 100644
--- a/t/libtool2.sh
+++ b/t/libtool2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure libtool clean targets exist.
# Report from Eric Magnien.
diff --git a/t/libtool3.sh b/t/libtool3.sh
index 24795d537..bb783e294 100644
--- a/t/libtool3.sh
+++ b/t/libtool3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Try to build and package a program linked to a Libtool library.
# Also make sure we do not bloat the Makefile with unneeded rules.
diff --git a/t/libtool4.sh b/t/libtool4.sh
index 387492e8b..0bfd2faa7 100644
--- a/t/libtool4.sh
+++ b/t/libtool4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure Automake suggests AC_PROG_LIBTOOL when *_LTLIBRARIES is used.
diff --git a/t/libtool5.sh b/t/libtool5.sh
index cc2777c4d..ccbeb3ce2 100644
--- a/t/libtool5.sh
+++ b/t/libtool5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure it's ok to install a library under different conditions
# in the same directory.
diff --git a/t/libtool6.sh b/t/libtool6.sh
index 643afed13..905c35267 100644
--- a/t/libtool6.sh
+++ b/t/libtool6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure it's OK to install a library under different conditions
# in different directories. PR/285.
diff --git a/t/libtool7.sh b/t/libtool7.sh
index 0dec8b925..3e6342d99 100644
--- a/t/libtool7.sh
+++ b/t/libtool7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we allow Libtool's -dlopen/-dlpreopen
# Also check basic support for AM_LIBTOOLFLAGS/LIBTOOLFLAGS
diff --git a/t/libtool8.sh b/t/libtool8.sh
index 5b73b43d7..1e983401e 100644
--- a/t/libtool8.sh
+++ b/t/libtool8.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure Automake diagnoses conflicting installations.
diff --git a/t/libtool9.sh b/t/libtool9.sh
index f955ba794..a4c392661 100644
--- a/t/libtool9.sh
+++ b/t/libtool9.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure xxx_LINK is defined for each target that requires specific
# flags.
diff --git a/t/license.sh b/t/license.sh
index a2519b98b..13813d111 100644
--- a/t/license.sh
+++ b/t/license.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure COPYING is not overwritten, even with -a -f.
diff --git a/t/license2.sh b/t/license2.sh
index d2704ac17..12bb31a6b 100644
--- a/t/license2.sh
+++ b/t/license2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that installing 'COPYING' outputs a warning.
diff --git a/t/link_c_cxx.sh b/t/link_c_cxx.sh
index b53fa680d..0ac7c01bc 100644
--- a/t/link_c_cxx.sh
+++ b/t/link_c_cxx.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure the C++ linker is used when appropriate.
# Matthew D. Langston
diff --git a/t/link_cond.sh b/t/link_cond.sh
index ebbfa9967..382e4a6e1 100644
--- a/t/link_cond.sh
+++ b/t/link_cond.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that automatic determination of the linker works well with
# conditional use of languages in a single program.
diff --git a/t/link_dist.sh b/t/link_dist.sh
index d891c2bab..b1bad18e9 100644
--- a/t/link_dist.sh
+++ b/t/link_dist.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure the linker for a dist_*_SOURCES can override that for
# *_SOURCES
diff --git a/t/link_f90_only.sh b/t/link_f90_only.sh
index 5a0764e1f..79e7a2627 100644
--- a/t/link_f90_only.sh
+++ b/t/link_f90_only.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure the Fortran 90 linker is used when appropriate.
# (copied from 'link_f_only.sh') Mike Nolta
diff --git a/t/link_f_only.sh b/t/link_f_only.sh
index eb1f3fad2..f8a9dcda0 100644
--- a/t/link_f_only.sh
+++ b/t/link_f_only.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure the Fortran 77 linker is used when appropriate.
# Matthew D. Langston
diff --git a/t/link_fc.sh b/t/link_fc.sh
index ba4fab8a8..f0a77b82e 100644
--- a/t/link_fc.sh
+++ b/t/link_fc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure the Fortran 77 linker is used when appropriate.
# Matthew D. Langston
diff --git a/t/link_fccxx.sh b/t/link_fccxx.sh
index fcb3eb44d..7c2001712 100644
--- a/t/link_fccxx.sh
+++ b/t/link_fccxx.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure the C++ linker is used when appropriate.
# Matthew D. Langston
diff --git a/t/link_fcxx.sh b/t/link_fcxx.sh
index 09a3c2b85..8a044d2df 100644
--- a/t/link_fcxx.sh
+++ b/t/link_fcxx.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure the C++ linker is used when appropriate.
# Matthew D. Langston
diff --git a/t/link_override.sh b/t/link_override.sh
index b9e3ca1a5..5ac59f850 100644
--- a/t/link_override.sh
+++ b/t/link_override.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure _LINK variables are detected and used as documented.
diff --git a/t/lisp-flags.sh b/t/lisp-flags.sh
index 8085b2240..34bb85ccd 100644
--- a/t/lisp-flags.sh
+++ b/t/lisp-flags.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Elisp byte-compilation honours AM_ELCFLAFS and ELCFLAGS.
diff --git a/t/lisp-loadpath.sh b/t/lisp-loadpath.sh
index 17e2a3be5..fa5b97010 100644
--- a/t/lisp-loadpath.sh
+++ b/t/lisp-loadpath.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Emacs lisp files in both $(srcdir) and $(builddir) are found if
# required by other files. Related to automake bug#11806.
diff --git a/t/lisp-pr11806.sh b/t/lisp-pr11806.sh
index b85695d31..d27df9507 100644
--- a/t/lisp-pr11806.sh
+++ b/t/lisp-pr11806.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Compiling .el files that requires each other in a VPATH build.
# See automake bug#11806.
diff --git a/t/lisp-subdir-mix.sh b/t/lisp-subdir-mix.sh
index 1db1f7fb1..526591bfc 100644
--- a/t/lisp-subdir-mix.sh
+++ b/t/lisp-subdir-mix.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check compiling elisp files in different subdirectories, where a
# file in a subdirectory might require a file in another one.
diff --git a/t/lisp-subdir.sh b/t/lisp-subdir.sh
index 406e3b901..7a3ed7fab 100644
--- a/t/lisp-subdir.sh
+++ b/t/lisp-subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Emacs lisp files in subdirectories.
diff --git a/t/lisp-subdir2.sh b/t/lisp-subdir2.sh
index a67e1748c..681549207 100644
--- a/t/lisp-subdir2.sh
+++ b/t/lisp-subdir2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Compiling elisp files in different subdirectories.
diff --git a/t/lisp2.sh b/t/lisp2.sh
index 48d2ee0ff..5e9903544 100644
--- a/t/lisp2.sh
+++ b/t/lisp2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that Automake suggest using AM_PATH_LISPDIR to define lispdir.
diff --git a/t/lisp3.sh b/t/lisp3.sh
index ed2b13c65..642b391c6 100644
--- a/t/lisp3.sh
+++ b/t/lisp3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that compiling interdependent elisp files works.
diff --git a/t/lisp4.sh b/t/lisp4.sh
index 53d5812de..5eacc8842 100644
--- a/t/lisp4.sh
+++ b/t/lisp4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure setting ELCFILES= disable byte-compilation as documented.
# Report from Simon Josefsson.
diff --git a/t/lisp5.sh b/t/lisp5.sh
index e0d28cd34..a98673e0b 100644
--- a/t/lisp5.sh
+++ b/t/lisp5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Same as 'lisp4.sh', but using the now-recommended way to install
# non-bytecompiled *.el files.
diff --git a/t/lisp6.sh b/t/lisp6.sh
index 042c41e3c..07c8e1d4d 100644
--- a/t/lisp6.sh
+++ b/t/lisp6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for conditional _LISP.
diff --git a/t/lisp7.sh b/t/lisp7.sh
index c7681aba7..833807843 100644
--- a/t/lisp7.sh
+++ b/t/lisp7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that lisp_LISP also works when emacs is not installed.
diff --git a/t/lisp8.sh b/t/lisp8.sh
index 74220ab86..92b81900b 100644
--- a/t/lisp8.sh
+++ b/t/lisp8.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check the recover rule of lisp_LISP with parallel make.
diff --git a/t/lispdry.sh b/t/lispdry.sh
index 87c8ba1ff..1f50061e4 100644
--- a/t/lispdry.sh
+++ b/t/lispdry.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that 'make -n' works with the lisp_LISP recover rule.
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 5e31ca2b6..13ba619a6 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -15,7 +15,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
# FIXME: this "expected failures" are in truth an hack used to
# FIXME: to verify that some incorrect usages of our perl libraries
diff --git a/t/listval.sh b/t/listval.sh
index 76eabad31..95970c705 100644
--- a/t/listval.sh
+++ b/t/listval.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure variable is expanded properly.
# From Adam J. Richter.
diff --git a/t/local.mk b/t/local.mk
index d5fd00cb1..082edb0a9 100644
--- a/t/local.mk
+++ b/t/local.mk
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with this program. If not, see .
+## along with this program. If not, see .
## ------------ ##
## Testsuite. ##
diff --git a/t/location.sh b/t/location.sh
index f3b4a1124..d13fc6251 100644
--- a/t/location.sh
+++ b/t/location.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for locations in error messages.
diff --git a/t/longlin2.sh b/t/longlin2.sh
index d28142f4a..858f3f95a 100644
--- a/t/longlin2.sh
+++ b/t/longlin2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Long lines should be wrapped.
# Report from Albert Chin.
diff --git a/t/longline.sh b/t/longline.sh
index 63dc32cc3..25920c689 100644
--- a/t/longline.sh
+++ b/t/longline.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Long lines of += should be wrapped.
# Report from Simon Josefsson.
diff --git a/t/ltcond.sh b/t/ltcond.sh
index c4f959588..1c013e821 100644
--- a/t/ltcond.sh
+++ b/t/ltcond.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for conditional libtool libraries.
# This combines two examples from the manual.
diff --git a/t/ltcond2.sh b/t/ltcond2.sh
index f2ec9ecda..e39935107 100644
--- a/t/ltcond2.sh
+++ b/t/ltcond2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug in conditionals.
diff --git a/t/ltconv.sh b/t/ltconv.sh
index 6ec44a54e..6f8a6fc2d 100644
--- a/t/ltconv.sh
+++ b/t/ltconv.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for libtool convenience libraries.
# This example is taken from the manual.
diff --git a/t/ltdeps.sh b/t/ltdeps.sh
index 5623053d7..40e39a1df 100644
--- a/t/ltdeps.sh
+++ b/t/ltdeps.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure libtool library dependencies are correct.
# Report from Lars J. Aas.
diff --git a/t/ltinit.sh b/t/ltinit.sh
index 9d41a88f7..70b109083 100644
--- a/t/ltinit.sh
+++ b/t/ltinit.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that libtool support works correctly when "newer" libtool
# interface (with LT_INIT etc.) is used (this interface has been
diff --git a/t/ltinstloc.sh b/t/ltinstloc.sh
index 47ce1ac9b..521547bce 100644
--- a/t/ltinstloc.sh
+++ b/t/ltinstloc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for libtool errors for multiple install locations, esp. with nobase.
diff --git a/t/ltlibobjs.sh b/t/ltlibobjs.sh
index d95dea3a0..4c00e4841 100644
--- a/t/ltlibobjs.sh
+++ b/t/ltlibobjs.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure LTLIBOBJS alone works ok.
# Report from Vadim Zeitlin.
diff --git a/t/ltlibsrc.sh b/t/ltlibsrc.sh
index 8f81cbe78..225330944 100644
--- a/t/ltlibsrc.sh
+++ b/t/ltlibsrc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure a sensible default source for libraries is used.
diff --git a/t/ltorder.sh b/t/ltorder.sh
index 0a99f2915..4e092037f 100644
--- a/t/ltorder.sh
+++ b/t/ltorder.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for correct installation order of nobase libtool libraries.
diff --git a/t/m4-inclusion.sh b/t/m4-inclusion.sh
index 9778b3805..15f5f336f 100644
--- a/t/m4-inclusion.sh
+++ b/t/m4-inclusion.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to see if 'm4_sinclude' and 'm4_include' works.
diff --git a/t/maintclean-vpath.sh b/t/maintclean-vpath.sh
index f50a58b6d..efb82c485 100644
--- a/t/maintclean-vpath.sh
+++ b/t/maintclean-vpath.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure distclean and maintainer-clean erase the right files.
# This test is for VPATH builds; see sister test 'maintclean.sh'
diff --git a/t/maintclean.sh b/t/maintclean.sh
index 67fc5cf93..6cec08f8e 100644
--- a/t/maintclean.sh
+++ b/t/maintclean.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure distclean and maintainer-clean erase the right files.
# This test is for in-tree builds; see sister test 'maintclean-vpath.sh'
diff --git a/t/maintmode-configure-msg.sh b/t/maintmode-configure-msg.sh
index d2eaf9097..6368f2710 100644
--- a/t/maintmode-configure-msg.sh
+++ b/t/maintmode-configure-msg.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that our macro 'AM_MAINTAINER_MODE' adds proper text to
# the configure help screen. Also make sure the "checking ..." messages
diff --git a/t/make-dryrun.tap b/t/make-dryrun.tap
index 203f97565..98189f0e7 100644
--- a/t/make-dryrun.tap
+++ b/t/make-dryrun.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that $(am__make_dryrun) works as expected.
diff --git a/t/make-is-gnu.sh b/t/make-is-gnu.sh
index 13fb176d4..c8478c9e8 100644
--- a/t/make-is-gnu.sh
+++ b/t/make-is-gnu.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that $(am__is_gnu_make) can be used to correctly determine if
# we are running under GNU make.
diff --git a/t/make-keepgoing.tap b/t/make-keepgoing.tap
index cce23c384..8cb5bb599 100644
--- a/t/make-keepgoing.tap
+++ b/t/make-keepgoing.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that $(am__make_keepgoing) works as expected.
diff --git a/t/make.sh b/t/make.sh
index 8ff715f61..36c010364 100644
--- a/t/make.sh
+++ b/t/make.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure 'make' check works.
# From Ralf Corsepius.
diff --git a/t/makefile-deps.sh b/t/makefile-deps.sh
index 0d4e9cae4..8f50a0977 100644
--- a/t/makefile-deps.sh
+++ b/t/makefile-deps.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we don't emit a rule with empty target if list of
# automatically-computed dependencies for Makefile.in is empty.
diff --git a/t/makej.sh b/t/makej.sh
index 80efd641f..6ebbac13a 100644
--- a/t/makej.sh
+++ b/t/makej.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# 'make -j' used to fail with Autoconf < 2.58, because tools like
# autoconf and automake can try to update autom4te's cache in parallel.
diff --git a/t/makej2.sh b/t/makej2.sh
index c23d8f65f..d2a7f6b3e 100644
--- a/t/makej2.sh
+++ b/t/makej2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure known BSD 'make -jN' issues are fixed:
# without -B, it may reuse the same shell for separate commands in a
diff --git a/t/maken.sh b/t/maken.sh
index ce9c22eb1..bb9705786 100644
--- a/t/maken.sh
+++ b/t/maken.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure that 'make -n dist' and 'make -n distcheck' do not change files
# on disk, due to GNU make executing rules containing '$(MAKE)'.
diff --git a/t/maken3.sh b/t/maken3.sh
index 6fc6fd856..1e5d02315 100644
--- a/t/maken3.sh
+++ b/t/maken3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test 'make -n' for various targets, to ensure that:
#
diff --git a/t/makevars.sh b/t/makevars.sh
index 691a52bc2..883038759 100644
--- a/t/makevars.sh
+++ b/t/makevars.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that automake includes the needed variables,
# but not too many.
diff --git a/t/man.sh b/t/man.sh
index 8b5c1f547..46f9c676b 100644
--- a/t/man.sh
+++ b/t/man.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure 'dist' prefix works with man pages.
diff --git a/t/man2.sh b/t/man2.sh
index a21293814..512fb93f9 100644
--- a/t/man2.sh
+++ b/t/man2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that man pages listed in man_MANS are installed and
# renamed as documented.
diff --git a/t/man3.sh b/t/man3.sh
index 65f7e7f45..582448ae1 100644
--- a/t/man3.sh
+++ b/t/man3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# PR 516: Prefer generated manpages to distributed ones.
diff --git a/t/man5.sh b/t/man5.sh
index 2dff9d3e7..0fb2abd8e 100644
--- a/t/man5.sh
+++ b/t/man5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure to extract the correct mansection from files in man_MANS.
diff --git a/t/man6.sh b/t/man6.sh
index c160981c8..9c05fa904 100644
--- a/t/man6.sh
+++ b/t/man6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure 'make distcheck' passes when help2man generates man pages,
# even if the 'missing' script is involved.
diff --git a/t/man7.sh b/t/man7.sh
index 14a50004d..5a95aada9 100644
--- a/t/man7.sh
+++ b/t/man7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check for a bug in maintainer-clean w.r.t. generated manpages.
diff --git a/t/man8.sh b/t/man8.sh
index f5c5e02ff..dcf619f4a 100644
--- a/t/man8.sh
+++ b/t/man8.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check for a bug in distcheck w.r.t. generated manpages.
diff --git a/t/mdate.sh b/t/mdate.sh
index c0930385c..6b43e6269 100644
--- a/t/mdate.sh
+++ b/t/mdate.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that mdate-sh is required when Texinfo used and version.texi needed.
diff --git a/t/mdate2.sh b/t/mdate2.sh
index 2eabac12b..519503911 100644
--- a/t/mdate2.sh
+++ b/t/mdate2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure mdate-sh is included in distribution.
diff --git a/t/mdate3.sh b/t/mdate3.sh
index 6a7d39e6f..7948482f6 100644
--- a/t/mdate3.sh
+++ b/t/mdate3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure mdate-sh run correctly.
diff --git a/t/mdate4.sh b/t/mdate4.sh
index d5a5cc297..fa2d9d4f5 100644
--- a/t/mdate4.sh
+++ b/t/mdate4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that mdate-sh is added to the right directory.
# Report from Kevin Dalley.
diff --git a/t/mdate5.sh b/t/mdate5.sh
index 7cbaba62b..cabcee339 100644
--- a/t/mdate5.sh
+++ b/t/mdate5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure mdate-sh works correctly.
diff --git a/t/mdate6.sh b/t/mdate6.sh
index 6b657ea9c..21729c8b5 100644
--- a/t/mdate6.sh
+++ b/t/mdate6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# mdate-sh can work with weird file names, doesn't eval too much.
diff --git a/t/missing-auxfile-stops-makefiles-creation.sh b/t/missing-auxfile-stops-makefiles-creation.sh
index 64c7b2d0e..6d794a3a8 100644
--- a/t/missing-auxfile-stops-makefiles-creation.sh
+++ b/t/missing-auxfile-stops-makefiles-creation.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Automake should stop the creation of Makefile.in files at the first
# encountered error due to a required auxiliary file not found.
diff --git a/t/missing-version-mismatch.sh b/t/missing-version-mismatch.sh
index e06ccd6c6..41146746b 100644
--- a/t/missing-version-mismatch.sh
+++ b/t/missing-version-mismatch.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test missing with version mismatches.
diff --git a/t/missing3.sh b/t/missing3.sh
index 2a6f2f380..f0bdeed36 100644
--- a/t/missing3.sh
+++ b/t/missing3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test missing when running a tool's --version.
diff --git a/t/mkdirp-deprecation.sh b/t/mkdirp-deprecation.sh
index 5087d678a..39e8d8a43 100644
--- a/t/mkdirp-deprecation.sh
+++ b/t/mkdirp-deprecation.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the AM_PROG_MKDIR_P macro is deprecated. It will be
# be removed in the next major Automake release.
diff --git a/t/mkinst2.sh b/t/mkinst2.sh
index 309dd4021..9a5f03cbe 100644
--- a/t/mkinst2.sh
+++ b/t/mkinst2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure no-installman suppresses man dir creation.
diff --git a/t/mkinst3.sh b/t/mkinst3.sh
index e667f4856..dad26b74d 100644
--- a/t/mkinst3.sh
+++ b/t/mkinst3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test mkinstalldirs with spaces in directory names.
diff --git a/t/mkinstall.sh b/t/mkinstall.sh
index 301844615..eb3787161 100644
--- a/t/mkinstall.sh
+++ b/t/mkinstall.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug where mkinstalldirs variable can be set incorrectly.
diff --git a/t/mmode.sh b/t/mmode.sh
index aa9b6299a..2dabcd612 100644
--- a/t/mmode.sh
+++ b/t/mmode.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check for AM_MAINTAINER_MODE defaults.
diff --git a/t/mmodely.sh b/t/mmodely.sh
index 38a70e446..19df3eac8 100644
--- a/t/mmodely.sh
+++ b/t/mmodely.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Verify that intermediate files are only built from Yacc and Lex
# sources in maintainer mode.
diff --git a/t/no-extra-c-stuff.sh b/t/no-extra-c-stuff.sh
index 700059b73..6939059a9 100644
--- a/t/no-extra-c-stuff.sh
+++ b/t/no-extra-c-stuff.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that Automake doesn't generated rules or definitions related
# to compilation of C sources for a project that doesn't use nor need
diff --git a/t/no-extra-makefile-code.sh b/t/no-extra-makefile-code.sh
index 7fb7bd8cb..48a7990b6 100644
--- a/t/no-extra-makefile-code.sh
+++ b/t/no-extra-makefile-code.sh
@@ -12,12 +12,12 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that we don't emit harmless but useless code in the generated
# Makefile.in when the project does not use compiled languages. Motivated
# by a regression caused by removal of automatic de-ANSI-fication support:
-#
+#
. test-init.sh
diff --git a/t/no-spurious-install-recursive.sh b/t/no-spurious-install-recursive.sh
index 88ecb8640..f5c91374e 100644
--- a/t/no-spurious-install-recursive.sh
+++ b/t/no-spurious-install-recursive.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Regression test for install-recursive appearing in a non recursive Makefile.
# Report from Bruno Haible.
diff --git a/t/nobase-libtool.sh b/t/nobase-libtool.sh
index 42dcad754..a17c44d6a 100644
--- a/t/nobase-libtool.sh
+++ b/t/nobase-libtool.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure nobase_* works for libtool libraries and programs as well.
# This is just the libtool equivalent of 'nobase.sh', split up to allow
diff --git a/t/nobase-nodist.sh b/t/nobase-nodist.sh
index e42a86d29..3a6342b30 100644
--- a/t/nobase-nodist.sh
+++ b/t/nobase-nodist.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Interaction of 'nobase_' and 'nodist_' prefixes.
diff --git a/t/nobase-python.sh b/t/nobase-python.sh
index ba197d025..436bb5e82 100644
--- a/t/nobase-python.sh
+++ b/t/nobase-python.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure nobase_* works for python files.
diff --git a/t/nobase.sh b/t/nobase.sh
index 25d613bd4..2bd1aa7ab 100644
--- a/t/nobase.sh
+++ b/t/nobase.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure nobase_* works.
diff --git a/t/nodef.sh b/t/nodef.sh
index 889d968e8..1b1de36de 100644
--- a/t/nodef.sh
+++ b/t/nodef.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that PACKAGE and VERSION are AC_DEFINEd when requested.
diff --git a/t/nodef2.sh b/t/nodef2.sh
index c5e729e3c..f39009c32 100644
--- a/t/nodef2.sh
+++ b/t/nodef2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that PACKAGE and VERSION are AC_DEFINEd when requested.
diff --git a/t/nodep.sh b/t/nodep.sh
index 1fb77e09a..a3dc815df 100644
--- a/t/nodep.sh
+++ b/t/nodep.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure no-dependencies option does the right thing.
# Bug report from Greg A. Woods.
diff --git a/t/nodep2.sh b/t/nodep2.sh
index 2dcb2716b..030e8865b 100644
--- a/t/nodep2.sh
+++ b/t/nodep2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Another test to make sure no-dependencies option does the right thing.
diff --git a/t/nodepcomp.sh b/t/nodepcomp.sh
index e6d9e5811..96a57ec8d 100644
--- a/t/nodepcomp.sh
+++ b/t/nodepcomp.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure depcomp isn't always required.
diff --git a/t/nodist.sh b/t/nodist.sh
index d0d51b35f..c299b3abd 100644
--- a/t/nodist.sh
+++ b/t/nodist.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure dist_*_SOURCES and nodist_*_SOURCES work.
diff --git a/t/nodist2.sh b/t/nodist2.sh
index 750a0988f..d43528628 100644
--- a/t/nodist2.sh
+++ b/t/nodist2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure nodist_noinst_HEADERS work.
# For PR 249.
diff --git a/t/nodist3.sh b/t/nodist3.sh
index 2131fe773..354995939 100644
--- a/t/nodist3.sh
+++ b/t/nodist3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure no-dist option works.
diff --git a/t/noinst.sh b/t/noinst.sh
index 4e306c548..4de379854 100644
--- a/t/noinst.sh
+++ b/t/noinst.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check to make sure "make install" will build all in directory with
# nothing to install.
diff --git a/t/noinstdir.sh b/t/noinstdir.sh
index 8424380cb..cab00fd0c 100644
--- a/t/noinstdir.sh
+++ b/t/noinstdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that noinst_* and check_* are not installed.
# From Pavel Roskin.
diff --git a/t/nolink.sh b/t/nolink.sh
index b5f5a0b40..63b78fb1c 100644
--- a/t/nolink.sh
+++ b/t/nolink.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure Automake does not emit a link rule for unknown languages.
diff --git a/t/nostdinc.sh b/t/nostdinc.sh
index 363a5c2a6..eeb774278 100644
--- a/t/nostdinc.sh
+++ b/t/nostdinc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure nostdinc option works correctly.
diff --git a/t/notrans.sh b/t/notrans.sh
index b85b7d7f6..ce9b421c2 100644
--- a/t/notrans.sh
+++ b/t/notrans.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check all notrans_, dist_, nodist_ prefix combinations for MANS
# primary and install-man dependencies.
diff --git a/t/number.sh b/t/number.sh
index f037c68e1..1a5742a6e 100644
--- a/t/number.sh
+++ b/t/number.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure _OBJECTS is only generated once. Bug reported by
# Joerg-Martin Schwarz.
diff --git a/t/objc-deps.sh b/t/objc-deps.sh
index 5914ddd87..60585bbd2 100644
--- a/t/objc-deps.sh
+++ b/t/objc-deps.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Automatic dependency tracking for Objective C.
# See also sister test 'objcxx-deps.sh'.
diff --git a/t/objc-flags.sh b/t/objc-flags.sh
index 0a7444a92..e493935ef 100644
--- a/t/objc-flags.sh
+++ b/t/objc-flags.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test Objective C compilation flags.
diff --git a/t/objc-megademo.sh b/t/objc-megademo.sh
index 6b54d1f5b..244ac9a5c 100644
--- a/t/objc-megademo.sh
+++ b/t/objc-megademo.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Stress test on Objective C/C++.
diff --git a/t/objc-minidemo.sh b/t/objc-minidemo.sh
index 8c313b410..5dfa7fdf6 100644
--- a/t/objc-minidemo.sh
+++ b/t/objc-minidemo.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Dummy demo package using Objective C and doing distcheck.
# See also sister test 'objcxx-minidemo.sh'.
diff --git a/t/objcxx-deps.sh b/t/objcxx-deps.sh
index 4494fd8e5..f7e2dbf8e 100644
--- a/t/objcxx-deps.sh
+++ b/t/objcxx-deps.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Automatic dependency tracking for Objective C++.
# See also sister test 'objc-deps.sh'.
diff --git a/t/objcxx-flags.sh b/t/objcxx-flags.sh
index 7c104a5d0..928bc56b7 100644
--- a/t/objcxx-flags.sh
+++ b/t/objcxx-flags.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test Objective C++ compilation flags.
# See also sister test 'objc-flags.sh'.
diff --git a/t/objcxx-minidemo.sh b/t/objcxx-minidemo.sh
index f4477d4c1..e8a0e4d71 100644
--- a/t/objcxx-minidemo.sh
+++ b/t/objcxx-minidemo.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Dummy demo package using Objective C++ and doing distcheck.
# See also sister test 'objc-minidemo.sh'.
diff --git a/t/objext-pr10128.sh b/t/objext-pr10128.sh
index 2f3eb1d05..ea738ecc8 100644
--- a/t/objext-pr10128.sh
+++ b/t/objext-pr10128.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for automake bug#10128: $(OBJEXT) redefinition causes
# $(foo_OBJECTS) to be defined as empty.
diff --git a/t/oldvars.sh b/t/oldvars.sh
index 1a17f2efe..6a1ec9f06 100644
--- a/t/oldvars.sh
+++ b/t/oldvars.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Use of these variables is deprecated:
# LISP, HEADERS, DATA, SCRIPTS, LTLIBRARIES, LIBRARIES, PROGRAMS, MANS.
diff --git a/t/order.sh b/t/order.sh
index 4174d3688..67a5d87b4 100644
--- a/t/order.sh
+++ b/t/order.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure AC_DEFUN is handled correctly. This test isn't named very
# well. Report from Jim Meyering.
diff --git a/t/output-order.sh b/t/output-order.sh
index 438c1dafd..457d33d5e 100644
--- a/t/output-order.sh
+++ b/t/output-order.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that 'automake -a' output order is stable.
# From report by Bruno Haible.
diff --git a/t/output.sh b/t/output.sh
index 40cde23a8..f0474be1b 100644
--- a/t/output.sh
+++ b/t/output.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure files listed in AC_OUTPUT are found.
diff --git a/t/output10.sh b/t/output10.sh
index 44a89fa1f..8957104c1 100644
--- a/t/output10.sh
+++ b/t/output10.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure an AC_CONFIG_FILES can have an AC_CONFIG_FILES output as input.
# This is comparable to 'output9.sh', but testing Makefile rules.
diff --git a/t/output11.sh b/t/output11.sh
index dd0fd537f..f91ec810b 100644
--- a/t/output11.sh
+++ b/t/output11.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure an AC_CONFIG_FILES ignore filenames with shell variables.
diff --git a/t/output12.sh b/t/output12.sh
index 4e4985126..27a30b1bc 100644
--- a/t/output12.sh
+++ b/t/output12.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure an AC_CONFIG_FILES process filenames with AC_SUBST variables.
diff --git a/t/output13.sh b/t/output13.sh
index f8cd82ed1..05a0013cb 100644
--- a/t/output13.sh
+++ b/t/output13.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure an AC_CONFIG_FILES, AC_CONFIG_LINKS, and AC_CONFIG_COMMANDS
# are not prerequisites of 'all'.
diff --git a/t/output2.sh b/t/output2.sh
index fbbaf5a45..32264ef64 100644
--- a/t/output2.sh
+++ b/t/output2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Another AC_OUTPUT test. From report by Ulrich Drepper.
diff --git a/t/output3.sh b/t/output3.sh
index 643d1f3c8..7870eb390 100644
--- a/t/output3.sh
+++ b/t/output3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Yet another AC_OUTPUT test.
diff --git a/t/output4.sh b/t/output4.sh
index bd99360b5..cc2ba319d 100644
--- a/t/output4.sh
+++ b/t/output4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# It's hard to believe there are so many AC_OUTPUT-related bugs.
diff --git a/t/output5.sh b/t/output5.sh
index 522c355ca..dd9466f63 100644
--- a/t/output5.sh
+++ b/t/output5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure Automake complains when there is no Makefile specified.
diff --git a/t/output6.sh b/t/output6.sh
index efc750c9b..fad71536e 100644
--- a/t/output6.sh
+++ b/t/output6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check for support for colon-separated input files in AC_CONFIG_FILES.
diff --git a/t/output7.sh b/t/output7.sh
index f02f2c059..9fb255e80 100644
--- a/t/output7.sh
+++ b/t/output7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check for support for colon separated input files in AC_CONFIG_FILES,
# with sources in sub directories.
diff --git a/t/output8.sh b/t/output8.sh
index 341600de1..f8c9b4f9a 100644
--- a/t/output8.sh
+++ b/t/output8.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check AC_CONFIG_FILES support for files starting with '../'.
# Report from Bruno Haible.
diff --git a/t/output9.sh b/t/output9.sh
index 79f9f67e6..b0645f325 100644
--- a/t/output9.sh
+++ b/t/output9.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure an AC_CONFIG_FILES can have an AC_CONFIG_FILES output as input.
diff --git a/t/override-conditional-1.sh b/t/override-conditional-1.sh
index 16afc714b..54ed455ee 100644
--- a/t/override-conditional-1.sh
+++ b/t/override-conditional-1.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for conditionally-defined overrides.
diff --git a/t/override-conditional-2.sh b/t/override-conditional-2.sh
index 5ce601d95..acf0e19d4 100644
--- a/t/override-conditional-2.sh
+++ b/t/override-conditional-2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that conditional overrides are diagnosed.
# This test is still xfailing; see the FIXME in Automake::Rule::define.
diff --git a/t/override-conditional-pr13940.sh b/t/override-conditional-pr13940.sh
index 6782af8c5..8c860a9f1 100644
--- a/t/override-conditional-pr13940.sh
+++ b/t/override-conditional-pr13940.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Expose automake bug#1394: automake erroneously think that a .PHONY
# target's rule is overridden only because we declare dependencies
diff --git a/t/override-html.sh b/t/override-html.sh
index 8c4820755..aed07c57f 100644
--- a/t/override-html.sh
+++ b/t/override-html.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that overriding 'html' target causes only one "html:" rule to
# be output.
diff --git a/t/override-suggest-local.sh b/t/override-suggest-local.sh
index 4337c6765..32d73a45b 100644
--- a/t/override-suggest-local.sh
+++ b/t/override-suggest-local.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure automake -Woverride suggests using TARGET-local instead
# of TARGET when possible.
diff --git a/t/parallel-am.sh b/t/parallel-am.sh
index f3b389e8c..6e1371c38 100644
--- a/t/parallel-am.sh
+++ b/t/parallel-am.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test parallel automake execution.
diff --git a/t/parallel-am2.sh b/t/parallel-am2.sh
index 3ab658941..c85bbeef7 100644
--- a/t/parallel-am2.sh
+++ b/t/parallel-am2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test parallel automake execution.
diff --git a/t/parallel-am3.sh b/t/parallel-am3.sh
index b0a5f3762..9d5ea02ba 100644
--- a/t/parallel-am3.sh
+++ b/t/parallel-am3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test parallel automake execution.
diff --git a/t/parallel-tests-basics.sh b/t/parallel-tests-basics.sh
index 579f514d6..e1dc8cb82 100644
--- a/t/parallel-tests-basics.sh
+++ b/t/parallel-tests-basics.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Basic checks on parallel-tests support:
# - console output
diff --git a/t/parallel-tests-cmdline-override.sh b/t/parallel-tests-cmdline-override.sh
index 243b85a69..1efacbe06 100644
--- a/t/parallel-tests-cmdline-override.sh
+++ b/t/parallel-tests-cmdline-override.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that we can use indirections when overriding TESTS and
# TEST_LOGS from the command line.
diff --git a/t/parallel-tests-concurrency-2.sh b/t/parallel-tests-concurrency-2.sh
index 67e1beb77..3c61a1a7d 100644
--- a/t/parallel-tests-concurrency-2.sh
+++ b/t/parallel-tests-concurrency-2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features:
# - concurrent program compilation and testing (with EXTRA_PROGRAMS)
diff --git a/t/parallel-tests-concurrency.sh b/t/parallel-tests-concurrency.sh
index 3940a5faa..69d6198b3 100644
--- a/t/parallel-tests-concurrency.sh
+++ b/t/parallel-tests-concurrency.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features:
# - concurrent parallel execution
diff --git a/t/parallel-tests-console-output.sh b/t/parallel-tests-console-output.sh
index fa441e037..e0fe331b5 100644
--- a/t/parallel-tests-console-output.sh
+++ b/t/parallel-tests-console-output.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# parallel-tests: some checks on console output about testsuite
# progress.
diff --git a/t/parallel-tests-driver-install.sh b/t/parallel-tests-driver-install.sh
index 63942bc2e..3bb27f0b4 100644
--- a/t/parallel-tests-driver-install.sh
+++ b/t/parallel-tests-driver-install.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that auxiliary script 'test-driver' gets automatically installed
# in the correct directory.
diff --git a/t/parallel-tests-dry-run-1.sh b/t/parallel-tests-dry-run-1.sh
index 26deed3b2..61e3d225b 100644
--- a/t/parallel-tests-dry-run-1.sh
+++ b/t/parallel-tests-dry-run-1.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check interactions between the parallel test harness and "make -n".
# See also sister test 'parallel-tests-dry-run-2.sh'.
diff --git a/t/parallel-tests-dry-run-2.sh b/t/parallel-tests-dry-run-2.sh
index 40a87347e..cbe38647c 100644
--- a/t/parallel-tests-dry-run-2.sh
+++ b/t/parallel-tests-dry-run-2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check interactions between the parallel test harness and "make -n".
# See also sister test 'parallel-tests-dry-run-1.sh'.
diff --git a/t/parallel-tests-empty-testlogs.sh b/t/parallel-tests-empty-testlogs.sh
index 059284748..55f89e60f 100644
--- a/t/parallel-tests-empty-testlogs.sh
+++ b/t/parallel-tests-empty-testlogs.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features:
# - empty TESTS
diff --git a/t/parallel-tests-empty.sh b/t/parallel-tests-empty.sh
index 1e17d42fb..828cda7d0 100644
--- a/t/parallel-tests-empty.sh
+++ b/t/parallel-tests-empty.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features:
# - empty TESTS
diff --git a/t/parallel-tests-exeext.sh b/t/parallel-tests-exeext.sh
index 40d4b826c..d7773e53b 100644
--- a/t/parallel-tests-exeext.sh
+++ b/t/parallel-tests-exeext.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# parallel-tests:
# - check2.am and interaction with $(EXEEXT)
diff --git a/t/parallel-tests-exit-status-reported.sh b/t/parallel-tests-exit-status-reported.sh
index e27f0d7f6..2b8420773 100644
--- a/t/parallel-tests-exit-status-reported.sh
+++ b/t/parallel-tests-exit-status-reported.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The exit status of a test should be reported in the test logs, so
# that one can see at a glance whether the test has succeeded or failed,
diff --git a/t/parallel-tests-exit-statuses.sh b/t/parallel-tests-exit-statuses.sh
index 0020edc4d..d8419629e 100644
--- a/t/parallel-tests-exit-statuses.sh
+++ b/t/parallel-tests-exit-statuses.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features: normal and special exit statuses
# in the test scripts.
diff --git a/t/parallel-tests-extra-programs.sh b/t/parallel-tests-extra-programs.sh
index 5ab5537be..6d33cb3cb 100644
--- a/t/parallel-tests-extra-programs.sh
+++ b/t/parallel-tests-extra-programs.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Parallel test harness: check that $(TESTS) can lazily depend on
# (or even be) $(EXTRA_PROGRAMS).
diff --git a/t/parallel-tests-fd-redirect-exeext.sh b/t/parallel-tests-fd-redirect-exeext.sh
index 306eb3919..217069140 100644
--- a/t/parallel-tests-fd-redirect-exeext.sh
+++ b/t/parallel-tests-fd-redirect-exeext.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# parallel-tests support: redirection of file descriptors with
# AM_TESTS_FD_REDIRECT, for tests which are binary executables
diff --git a/t/parallel-tests-fd-redirect.sh b/t/parallel-tests-fd-redirect.sh
index 98392fc89..386b7aada 100644
--- a/t/parallel-tests-fd-redirect.sh
+++ b/t/parallel-tests-fd-redirect.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# parallel-tests support: redirection of file descriptors with
# AM_TESTS_FD_REDIRECT, even when using tests without suffix.
diff --git a/t/parallel-tests-fork-bomb.sh b/t/parallel-tests-fork-bomb.sh
index 7aa19d800..315e891cb 100644
--- a/t/parallel-tests-fork-bomb.sh
+++ b/t/parallel-tests-fork-bomb.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features:
# - If $(TEST_SUITE_LOG) is in $(TEST_LOGS), we get a diagnosed
diff --git a/t/parallel-tests-generated-and-distributed.sh b/t/parallel-tests-generated-and-distributed.sh
index 61c0fb999..9627586f5 100644
--- a/t/parallel-tests-generated-and-distributed.sh
+++ b/t/parallel-tests-generated-and-distributed.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features:
# - generated distributed tests.
diff --git a/t/parallel-tests-harderror.sh b/t/parallel-tests-harderror.sh
index 32b113a7b..70e21441e 100644
--- a/t/parallel-tests-harderror.sh
+++ b/t/parallel-tests-harderror.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features: DISABLE_HARD_ERRORS
diff --git a/t/parallel-tests-interrupt.tap b/t/parallel-tests-interrupt.tap
index a57667c15..9f0c5a049 100644
--- a/t/parallel-tests-interrupt.tap
+++ b/t/parallel-tests-interrupt.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the parallel testsuite harness removes incomplete log files
# when interrupt upon some signal. This test is definitely too hacky,
diff --git a/t/parallel-tests-log-compiler-1.sh b/t/parallel-tests-log-compiler-1.sh
index 4168f5200..12bdb92a1 100644
--- a/t/parallel-tests-log-compiler-1.sh
+++ b/t/parallel-tests-log-compiler-1.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features:
# - per-extension "test runners" a.k.a. "log compilers" (xxx_LOG_COMPILER
diff --git a/t/parallel-tests-log-compiler-2.sh b/t/parallel-tests-log-compiler-2.sh
index ed836cf34..ad9535af5 100644
--- a/t/parallel-tests-log-compiler-2.sh
+++ b/t/parallel-tests-log-compiler-2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features:
# - per-extension "test runners" a.k.a. "log compilers" (xxx_LOG_COMPILER
diff --git a/t/parallel-tests-log-compiler-example.sh b/t/parallel-tests-log-compiler-example.sh
index 32f970228..281d4ce32 100644
--- a/t/parallel-tests-log-compiler-example.sh
+++ b/t/parallel-tests-log-compiler-example.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test the example of usage of generic and extension-specific
# LOG_COMPILER and LOG_FLAGS given in the manual.
diff --git a/t/parallel-tests-log-override-1.sh b/t/parallel-tests-log-override-1.sh
index ea5b99b4d..6d4672efa 100644
--- a/t/parallel-tests-log-override-1.sh
+++ b/t/parallel-tests-log-override-1.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features: runtime redefinition of $(TEST_SUITE_LOG).
diff --git a/t/parallel-tests-log-override-2.sh b/t/parallel-tests-log-override-2.sh
index 8066580c3..470a8f8f8 100644
--- a/t/parallel-tests-log-override-2.sh
+++ b/t/parallel-tests-log-override-2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features: runtime redefinition of:
# - $(TEST_SUITE_LOG) and $(TESTS)
diff --git a/t/parallel-tests-log-override-recheck.sh b/t/parallel-tests-log-override-recheck.sh
index f72196680..f5097f857 100644
--- a/t/parallel-tests-log-override-recheck.sh
+++ b/t/parallel-tests-log-override-recheck.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features: runtime redefinition of $(TEST_SUITE_LOG)
# for the recheck target.
diff --git a/t/parallel-tests-no-color-in-log.sh b/t/parallel-tests-no-color-in-log.sh
index 7633d24eb..0c4a7b6cf 100644
--- a/t/parallel-tests-no-color-in-log.sh
+++ b/t/parallel-tests-no-color-in-log.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Colorized output from the testsuite report shouldn't end up in log files.
diff --git a/t/parallel-tests-no-spurious-summary.sh b/t/parallel-tests-no-spurious-summary.sh
index dbe6b3cdf..888a60042 100644
--- a/t/parallel-tests-no-spurious-summary.sh
+++ b/t/parallel-tests-no-spurious-summary.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that ':test-results:' directives in test scripts' output doesn't
# originate spurious results in the testsuite summary.
diff --git a/t/parallel-tests-once.sh b/t/parallel-tests-once.sh
index c4f8b8016..add9cf4eb 100644
--- a/t/parallel-tests-once.sh
+++ b/t/parallel-tests-once.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Tests shouldn't be run multiple times by a simple "make check" in a
# clean directory. An early implementation of the '.trs' intermediate
diff --git a/t/parallel-tests-recheck-depends-on-all.sh b/t/parallel-tests-recheck-depends-on-all.sh
index 199d10597..736f4708a 100644
--- a/t/parallel-tests-recheck-depends-on-all.sh
+++ b/t/parallel-tests-recheck-depends-on-all.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The parallel-tests 'recheck' target must depend on the 'all' target.
# See automake bug#11252.
diff --git a/t/parallel-tests-recheck-pr11791.sh b/t/parallel-tests-recheck-pr11791.sh
index 9eccf92f1..ffb99d4f7 100644
--- a/t/parallel-tests-recheck-pr11791.sh
+++ b/t/parallel-tests-recheck-pr11791.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# parallel-tests: "make recheck" and "make -k recheck" in the face of
# build failures for the test cases. See automake bug#11791.
diff --git a/t/parallel-tests-recheck.sh b/t/parallel-tests-recheck.sh
index 9a84fea78..2ea07d1a8 100644
--- a/t/parallel-tests-recheck.sh
+++ b/t/parallel-tests-recheck.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features:
# - recheck
diff --git a/t/parallel-tests-reset-term.sh b/t/parallel-tests-reset-term.sh
index c77c9a37c..01cf4f9cc 100644
--- a/t/parallel-tests-reset-term.sh
+++ b/t/parallel-tests-reset-term.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the testsuite harness correctly handle overrides of the
# TERM variable by either TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT.
diff --git a/t/parallel-tests-subdir.sh b/t/parallel-tests-subdir.sh
index 86796035d..1647b5b55 100644
--- a/t/parallel-tests-subdir.sh
+++ b/t/parallel-tests-subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the parallel test harness creates parent directories for
# the log files when needed.
diff --git a/t/parallel-tests-suffix-prog.sh b/t/parallel-tests-suffix-prog.sh
index 4163dbcf1..abddb6439 100644
--- a/t/parallel-tests-suffix-prog.sh
+++ b/t/parallel-tests-suffix-prog.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features:
# - suffix rules, with PROGRAMS involved
diff --git a/t/parallel-tests-suffix.sh b/t/parallel-tests-suffix.sh
index c3dc0a5b2..47bdccf4c 100644
--- a/t/parallel-tests-suffix.sh
+++ b/t/parallel-tests-suffix.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features:
# - suffix rules
diff --git a/t/parallel-tests-trailing-whitespace.sh b/t/parallel-tests-trailing-whitespace.sh
index 9211c56cf..f82f76cb3 100644
--- a/t/parallel-tests-trailing-whitespace.sh
+++ b/t/parallel-tests-trailing-whitespace.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check parallel-tests features:
# - trailing whitespace in TESTS
diff --git a/t/parallel-tests-unreadable.sh b/t/parallel-tests-unreadable.sh
index fec728610..e57c4c0a8 100644
--- a/t/parallel-tests-unreadable.sh
+++ b/t/parallel-tests-unreadable.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the testsuite driver copes well with unreadable '.log'
# and '.trs' files.
diff --git a/t/parse.sh b/t/parse.sh
index 972ff6d9d..06565c497 100644
--- a/t/parse.sh
+++ b/t/parse.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure backslash-newline is treated as whitespace.
diff --git a/t/per-target-flags.sh b/t/per-target-flags.sh
index 889a32688..f9bbd32f2 100644
--- a/t/per-target-flags.sh
+++ b/t/per-target-flags.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test executable-specific and library-specific flags, both with
# and without dependency tracking.
diff --git a/t/percent.sh b/t/percent.sh
index 877679332..e8492e7b7 100644
--- a/t/percent.sh
+++ b/t/percent.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that -Wportability understands %-style pattern
# rules.
diff --git a/t/percent2.sh b/t/percent2.sh
index eb088abde..1aabfa72c 100644
--- a/t/percent2.sh
+++ b/t/percent2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Another test for -Wportability warning about %-style rules, plus
# make sure we don't warn about duplicate definition for
diff --git a/t/perf/cond.sh b/t/perf/cond.sh
index fef5557c5..07ffb945b 100755
--- a/t/perf/cond.sh
+++ b/t/perf/cond.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that many conditions do not lead to combinatorial explosion.
# (This is related to PR/352.)
diff --git a/t/perf/testsuite-recheck.sh b/t/perf/testsuite-recheck.sh
index 2b5fa198e..d3c63503e 100755
--- a/t/perf/testsuite-recheck.sh
+++ b/t/perf/testsuite-recheck.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check performance of recheck target in the face of many failed tests.
# FIXME: this test is not currently able to detect whether the measured
diff --git a/t/perf/testsuite-summary.sh b/t/perf/testsuite-summary.sh
index d4a6261eb..ca8e9a115 100755
--- a/t/perf/testsuite-summary.sh
+++ b/t/perf/testsuite-summary.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check performanceof recipe generating test-suite.log file and testsuite
# summary. That has suffered of huge inefficiencies in the past.
diff --git a/t/phony.sh b/t/phony.sh
index 44e4b3089..d6eeba829 100644
--- a/t/phony.sh
+++ b/t/phony.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure .PHONY can be given dependencies several times.
# From Ralf Corsepius.
diff --git a/t/pkg-config-macros.sh b/t/pkg-config-macros.sh
index a69bc8fa3..e4d761fac 100644
--- a/t/pkg-config-macros.sh
+++ b/t/pkg-config-macros.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Try to find the pkg-config '.m4' files and make them easily accessed
# to the test cases requiring them.
diff --git a/t/pluseq.sh b/t/pluseq.sh
index 109537ecc..f769305dc 100644
--- a/t/pluseq.sh
+++ b/t/pluseq.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test '+=' functionality.
diff --git a/t/pluseq10.sh b/t/pluseq10.sh
index 237098261..9af0591e5 100644
--- a/t/pluseq10.sh
+++ b/t/pluseq10.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for += and backslashes.
# Reported by Ralf Corsepius.
diff --git a/t/pluseq11.sh b/t/pluseq11.sh
index 2717c28a6..f65c5bf50 100644
--- a/t/pluseq11.sh
+++ b/t/pluseq11.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check for bug in variable concatenation with '+=': an extra backslash
# is erroneously retained in the final value.
diff --git a/t/pluseq2.sh b/t/pluseq2.sh
index b6cc80e29..b4f850d0a 100644
--- a/t/pluseq2.sh
+++ b/t/pluseq2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test '+=' with conditionals.
diff --git a/t/pluseq3.sh b/t/pluseq3.sh
index 9e648b71c..7c8a8816c 100644
--- a/t/pluseq3.sh
+++ b/t/pluseq3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Another '+=' test with conditionals.
diff --git a/t/pluseq4.sh b/t/pluseq4.sh
index 385e6637f..df1294518 100644
--- a/t/pluseq4.sh
+++ b/t/pluseq4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Yet another '+=' test.
diff --git a/t/pluseq5.sh b/t/pluseq5.sh
index b1880f7c6..145287540 100644
--- a/t/pluseq5.sh
+++ b/t/pluseq5.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for another '+=' problem. Report from Brian Jones.
diff --git a/t/pluseq6.sh b/t/pluseq6.sh
index 0a473a8bb..891454ab5 100644
--- a/t/pluseq6.sh
+++ b/t/pluseq6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that '+=' works with standard header-vars.
diff --git a/t/pluseq7.sh b/t/pluseq7.sh
index fb0f904e9..c457453c7 100644
--- a/t/pluseq7.sh
+++ b/t/pluseq7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that '+=' fails when required.
diff --git a/t/pluseq8.sh b/t/pluseq8.sh
index 8fd868c4d..40ceb17c3 100644
--- a/t/pluseq8.sh
+++ b/t/pluseq8.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Another '+=' test. From Paul Berrevoets.
diff --git a/t/pluseq9.sh b/t/pluseq9.sh
index d970e398c..b6b46a2af 100644
--- a/t/pluseq9.sh
+++ b/t/pluseq9.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test the += diagnostics.
diff --git a/t/pm/Cond2.pl b/t/pm/Cond2.pl
index 5ec2d2352..702ed9109 100644
--- a/t/pm/Cond2.pl
+++ b/t/pm/Cond2.pl
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Catch common programming error:
# A Condition passed as a string to 'new'.
diff --git a/t/pm/Cond3.pl b/t/pm/Cond3.pl
index 477a02c74..0ffe9553b 100644
--- a/t/pm/Cond3.pl
+++ b/t/pm/Cond3.pl
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Catch common programming error:
# A Condition passed as a string to 'new'.
diff --git a/t/pm/Condition-t.pl b/t/pm/Condition-t.pl
index bc78edd02..fcd971a57 100644
--- a/t/pm/Condition-t.pl
+++ b/t/pm/Condition-t.pl
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
BEGIN {
use Config;
diff --git a/t/pm/Condition.pl b/t/pm/Condition.pl
index 4d85be4e8..8ebb7c7e2 100644
--- a/t/pm/Condition.pl
+++ b/t/pm/Condition.pl
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
use Automake::Condition qw/TRUE FALSE/;
diff --git a/t/pm/DisjCon2.pl b/t/pm/DisjCon2.pl
index 80fa63778..26619a2a2 100644
--- a/t/pm/DisjCon2.pl
+++ b/t/pm/DisjCon2.pl
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Catch common programming error:
# A non-Condition reference passed to new.
diff --git a/t/pm/DisjCon3.pl b/t/pm/DisjCon3.pl
index 09ae1f5f7..82abb7423 100644
--- a/t/pm/DisjCon3.pl
+++ b/t/pm/DisjCon3.pl
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Catch common programming error:
# A non-reference passed to new.
diff --git a/t/pm/DisjConditions-t.pl b/t/pm/DisjConditions-t.pl
index 7d666bca9..adcc4201f 100644
--- a/t/pm/DisjConditions-t.pl
+++ b/t/pm/DisjConditions-t.pl
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
BEGIN {
use Config;
diff --git a/t/pm/DisjConditions.pl b/t/pm/DisjConditions.pl
index 5abe2c004..07952f43f 100644
--- a/t/pm/DisjConditions.pl
+++ b/t/pm/DisjConditions.pl
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
use Automake::Condition qw/TRUE FALSE/;
use Automake::DisjConditions;
diff --git a/t/pm/Version.pl b/t/pm/Version.pl
index 26611bb2e..764478a2f 100644
--- a/t/pm/Version.pl
+++ b/t/pm/Version.pl
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
use Automake::Version;
diff --git a/t/pm/Version2.pl b/t/pm/Version2.pl
index c9e4d7884..4d9bfaa45 100644
--- a/t/pm/Version2.pl
+++ b/t/pm/Version2.pl
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# prog_error due to invalid $VERSION.
diff --git a/t/pm/Version3.pl b/t/pm/Version3.pl
index 1f156e11b..aa559b2ee 100644
--- a/t/pm/Version3.pl
+++ b/t/pm/Version3.pl
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# prog_error due to invalid $REQUIRED.
diff --git a/t/pm/Wrap.pl b/t/pm/Wrap.pl
index 80c36f1f6..4da251128 100644
--- a/t/pm/Wrap.pl
+++ b/t/pm/Wrap.pl
@@ -11,7 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
use Automake::Wrap qw/wrap makefile_wrap/;
diff --git a/t/posixsubst-data.sh b/t/posixsubst-data.sh
index 2b2351195..2dc46237e 100644
--- a/t/posixsubst-data.sh
+++ b/t/posixsubst-data.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that POSIX variable expansion '$(var:str=rpl)' works
# in when used with the DATA primary.
diff --git a/t/posixsubst-extradist.sh b/t/posixsubst-extradist.sh
index 51253d2ee..d821ebf5a 100644
--- a/t/posixsubst-extradist.sh
+++ b/t/posixsubst-extradist.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that POSIX variable expansion '$(var:str=rpl)' works when used
# in EXTRA_DIST.
diff --git a/t/posixsubst-ldadd.sh b/t/posixsubst-ldadd.sh
index b681ee216..555360b16 100644
--- a/t/posixsubst-ldadd.sh
+++ b/t/posixsubst-ldadd.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that POSIX variable expansion '$(var:str=rpl)' works
# when used in LDADD.
diff --git a/t/posixsubst-libraries.sh b/t/posixsubst-libraries.sh
index cd0dd9a4f..b65b756d6 100644
--- a/t/posixsubst-libraries.sh
+++ b/t/posixsubst-libraries.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that POSIX variable expansion '$(var:str=rpl)' works when used
# with the LIBRARIES primary in a "simple" way.
diff --git a/t/posixsubst-ltlibraries.sh b/t/posixsubst-ltlibraries.sh
index 9d258825a..37848114f 100644
--- a/t/posixsubst-ltlibraries.sh
+++ b/t/posixsubst-ltlibraries.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that POSIX variable expansion '$(var:str=rpl)' works when used
# with the LTLIBRARIES primary in a "simple" way.
diff --git a/t/posixsubst-programs.sh b/t/posixsubst-programs.sh
index b00bfc2a8..2a41f049b 100644
--- a/t/posixsubst-programs.sh
+++ b/t/posixsubst-programs.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that POSIX variable expansion '$(var:str=rpl)' works when used
# with the PROGRAMS primary.
diff --git a/t/posixsubst-scripts.sh b/t/posixsubst-scripts.sh
index 9289bc468..e3e7257e8 100644
--- a/t/posixsubst-scripts.sh
+++ b/t/posixsubst-scripts.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that POSIX variable expansion '$(var:str=rpl)' works when used
# with the SCRIPTS primary.
diff --git a/t/posixsubst-sources.sh b/t/posixsubst-sources.sh
index db820255a..0efbf6f1d 100644
--- a/t/posixsubst-sources.sh
+++ b/t/posixsubst-sources.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that POSIX variable expansion '$(var:str=rpl)' works when used
# with the SOURCES primary.
diff --git a/t/posixsubst-tests.sh b/t/posixsubst-tests.sh
index 7d0f990aa..77e6c446b 100644
--- a/t/posixsubst-tests.sh
+++ b/t/posixsubst-tests.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test that POSIX variable expansion '$(var:str=rpl)' works when used
# with the TESTS special variable.
diff --git a/t/ppf77.sh b/t/ppf77.sh
index 1c84d244a..dcc177331 100644
--- a/t/ppf77.sh
+++ b/t/ppf77.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure preprocessed F77 works.
# Report from Jochen Kuepper.
diff --git a/t/pr2.sh b/t/pr2.sh
index 4525bb1db..0a7a90daa 100644
--- a/t/pr2.sh
+++ b/t/pr2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug reported in PR 2.
# "make dist" fails for AC_OUTPUT(README.foo:templ/README.foo.in).
diff --git a/t/pr211.sh b/t/pr211.sh
index 69926967a..367fef3f9 100644
--- a/t/pr211.sh
+++ b/t/pr211.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR 211.
#
diff --git a/t/pr220.sh b/t/pr220.sh
index c9bf9cbe3..a80eb2c7b 100644
--- a/t/pr220.sh
+++ b/t/pr220.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR automake/220.
# Test for problems when conditionals are not actually defined.
diff --git a/t/pr224.sh b/t/pr224.sh
index ddf675541..32fa67b3e 100644
--- a/t/pr224.sh
+++ b/t/pr224.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR automake/224: $(top_srcdir) w.r.t. dependencies.
#
diff --git a/t/pr229.sh b/t/pr229.sh
index 3d8beb688..bed6d819a 100644
--- a/t/pr229.sh
+++ b/t/pr229.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR automake/229.
# Make sure AC_CYGWIN requires config.{sub,guess}.
diff --git a/t/pr243.sh b/t/pr243.sh
index aae4d07f3..9f5b52d9e 100644
--- a/t/pr243.sh
+++ b/t/pr243.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR 243.
# AM_OUTPUT_DEPENDENCY_COMMANDS doesn't handle
diff --git a/t/pr266.sh b/t/pr266.sh
index b48aa4f73..cabfd6504 100644
--- a/t/pr266.sh
+++ b/t/pr266.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR 266.
# Dependency tracking -vs- nonstandard Makefile names
diff --git a/t/pr279-2.sh b/t/pr279-2.sh
index e8902ff06..21e8c4c1d 100644
--- a/t/pr279-2.sh
+++ b/t/pr279-2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Another test related to PR 279.
# Multiple DEPENDENCIES on conditionals.
diff --git a/t/pr279.sh b/t/pr279.sh
index e076a2d30..0d209b2c2 100644
--- a/t/pr279.sh
+++ b/t/pr279.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR 279.
# Multiple DEPENDENCIES on conditionals.
diff --git a/t/pr287.sh b/t/pr287.sh
index 4f416e0b2..5ad8b0caf 100644
--- a/t/pr287.sh
+++ b/t/pr287.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR 287: empty SUBDIRS.
diff --git a/t/pr300-lib.sh b/t/pr300-lib.sh
index 5255ccce9..06768058c 100644
--- a/t/pr300-lib.sh
+++ b/t/pr300-lib.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that installing subdirectory libraries works.
# PR/300
diff --git a/t/pr300-ltlib.sh b/t/pr300-ltlib.sh
index 48ea3e0c2..7a249bbf5 100644
--- a/t/pr300-ltlib.sh
+++ b/t/pr300-ltlib.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that installing subdirectory libtool libraries works.
# PR/300
diff --git a/t/pr300-prog.sh b/t/pr300-prog.sh
index d5cf2cb2b..a50d519c8 100644
--- a/t/pr300-prog.sh
+++ b/t/pr300-prog.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that installing subdirectory programs works.
# PR/300
diff --git a/t/pr307.sh b/t/pr307.sh
index 87f4e05a4..3380d07b0 100644
--- a/t/pr307.sh
+++ b/t/pr307.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR 307: depcomp with depmode=dashmstdout libtool race condition
# Report from Laurent Morichetti.
diff --git a/t/pr401.sh b/t/pr401.sh
index 027d61d4c..77c240120 100644
--- a/t/pr401.sh
+++ b/t/pr401.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check support for AC_CONFIG_LIBOBJ_DIR vs LIBOBJS.
# (pr401b.sh and pr401c.sh do the same for LTLIBOBJS and ALLOCA)
diff --git a/t/pr401b.sh b/t/pr401b.sh
index cc769f697..4dc3df650 100644
--- a/t/pr401b.sh
+++ b/t/pr401b.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check support for AC_CONFIG_LIBOBJ_DIR vs LTLIBOBJS.
# (pr401.sh and pr401c.sh do the same for LIBOBJS and ALLOCA)
diff --git a/t/pr401c.sh b/t/pr401c.sh
index 78381fbae..e6369a4b5 100644
--- a/t/pr401c.sh
+++ b/t/pr401c.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check support for AC_CONFIG_LIBOBJ_DIR vs ALLOCA.
# (pr401.sh and pr401b.sh do the same for LIBOBJS and LTLIBOBJS)
diff --git a/t/pr72.sh b/t/pr72.sh
index f7b77d80e..d853a6c78 100644
--- a/t/pr72.sh
+++ b/t/pr72.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR 72
# Empty _SOURCES results in $(LINK) undefined.
diff --git a/t/pr87.sh b/t/pr87.sh
index 26ea30b3d..35bd217ba 100644
--- a/t/pr87.sh
+++ b/t/pr87.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for PR automake/87.
# "make distcheck" fails when two source dirs exist.
diff --git a/t/pr9.sh b/t/pr9.sh
index 67eacac92..956ed0d53 100644
--- a/t/pr9.sh
+++ b/t/pr9.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug in PR 9.
# "make dist" incorrect when AC_CONFIG_AUX_DIR is present.
diff --git a/t/precious.sh b/t/precious.sh
index b819249f3..54065e14d 100644
--- a/t/precious.sh
+++ b/t/precious.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure .PRECIOUS can be extended by the user, and can be given
# dependencies several times.
diff --git a/t/prefix.sh b/t/prefix.sh
index f08c54592..2409a2d5b 100644
--- a/t/prefix.sh
+++ b/t/prefix.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure range of prefixes can be extended
diff --git a/t/preproc-basics.sh b/t/preproc-basics.sh
index 300199efb..4e37daa87 100644
--- a/t/preproc-basics.sh
+++ b/t/preproc-basics.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Basic tests for '%...%' preprocessing in included Makefile fragments:
# %reldir% a.k.a. %D%
diff --git a/t/preproc-c-compile.sh b/t/preproc-c-compile.sh
index 9df585d73..5f659346b 100644
--- a/t/preproc-c-compile.sh
+++ b/t/preproc-c-compile.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test pre-processing substitutions '%reldir%' and '%canon_reldir%'
# with C compilation and subdir objects.
diff --git a/t/preproc-demo.sh b/t/preproc-demo.sh
index 226a6d02a..a86f51c4a 100644
--- a/t/preproc-demo.sh
+++ b/t/preproc-demo.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Demo of a package using pre-processing substitutions '%reldir%' and
# '%canon_reldir%', and their respective shorthands '%D%' and '%C%'.
diff --git a/t/preproc-errmsg.sh b/t/preproc-errmsg.sh
index 0a660b6a1..47cbd3c9a 100644
--- a/t/preproc-errmsg.sh
+++ b/t/preproc-errmsg.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Tests error messages when '%reldir%' and '%canon_reldir%' substitutions
# (and their shorthands '%D%' and '%C%') are involved.
diff --git a/t/primary-prefix-couples-documented-valid.sh b/t/primary-prefix-couples-documented-valid.sh
index 2e290bade..6cef44f2c 100644
--- a/t/primary-prefix-couples-documented-valid.sh
+++ b/t/primary-prefix-couples-documented-valid.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the "uncommon" prefix/primary combinations used in
# examples in the Automake manual do not cause obvious errors.
diff --git a/t/primary-prefix-couples-force-valid.sh b/t/primary-prefix-couples-force-valid.sh
index a7da65dcb..f7ba8b7b5 100644
--- a/t/primary-prefix-couples-force-valid.sh
+++ b/t/primary-prefix-couples-force-valid.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that a user who wants to use an invalid prefix/primary
# combination can do so with a proper workaround.
diff --git a/t/primary-prefix-invalid-couples.tap b/t/primary-prefix-invalid-couples.tap
index ff82342af..1058ff5c0 100644
--- a/t/primary-prefix-invalid-couples.tap
+++ b/t/primary-prefix-invalid-couples.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Not all primaries/directories combinations are valid.
# Automake should flag them as errors.
diff --git a/t/primary-prefix-valid-couples.sh b/t/primary-prefix-valid-couples.sh
index d8c451290..b7c64e2b9 100644
--- a/t/primary-prefix-valid-couples.sh
+++ b/t/primary-prefix-valid-couples.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for valid prefix/primary combinations.
# See also test 'primary-prefix-invalid-couples.sh'.
diff --git a/t/primary.sh b/t/primary.sh
index 166a6f1f2..24ce9bf84 100644
--- a/t/primary.sh
+++ b/t/primary.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure errors in am_install_var work.
diff --git a/t/primary2.sh b/t/primary2.sh
index f23a11b05..951709b14 100644
--- a/t/primary2.sh
+++ b/t/primary2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure errors in am_install_var work.
diff --git a/t/primary3.sh b/t/primary3.sh
index 647fbf7ee..0307f25c5 100644
--- a/t/primary3.sh
+++ b/t/primary3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we can build programs ending in '.la'
diff --git a/t/print-libdir.sh b/t/print-libdir.sh
index e8aeb7f1c..a19db0feb 100644
--- a/t/print-libdir.sh
+++ b/t/print-libdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test on automake options '--print-data-dir' and '--print-script-dir'.
diff --git a/t/proginst.sh b/t/proginst.sh
index e3b9db7cb..98ce4f81d 100644
--- a/t/proginst.sh
+++ b/t/proginst.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for bug where when multiple scripts are installed,
# the check for AC_PROG_INSTALL fails.
diff --git a/t/programs-primary-rewritten.sh b/t/programs-primary-rewritten.sh
index 208ef1188..1b2cd3db7 100644
--- a/t/programs-primary-rewritten.sh
+++ b/t/programs-primary-rewritten.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure xxx_PROGRAMS gets properly rewritten where needed. These
# checks have been introduced in commit 'Release-1-9-254-g9d0eaef' into
diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh
index 3b08b5a43..bc1af61e6 100644
--- a/t/py-compile-basedir.sh
+++ b/t/py-compile-basedir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test the '--basedir' option of the 'py-compile' script,
diff --git a/t/py-compile-basic.sh b/t/py-compile-basic.sh
index 600e08d9c..ab12f272b 100644
--- a/t/py-compile-basic.sh
+++ b/t/py-compile-basic.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test more basic functionalities of the 'py-compile' script,
# with "believable" python sources. See also related test
diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh
index 9b4c22e4d..c524ecec1 100644
--- a/t/py-compile-destdir.sh
+++ b/t/py-compile-destdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test the '--destdir' option of the 'py-compile' script,
diff --git a/t/py-compile-env.sh b/t/py-compile-env.sh
index da5e75f93..d25d67da3 100644
--- a/t/py-compile-env.sh
+++ b/t/py-compile-env.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure 'py-compile' honours the PYTHON environment variable.
diff --git a/t/py-compile-option-terminate.sh b/t/py-compile-option-terminate.sh
index 502564b5f..a2c2d2095 100644
--- a/t/py-compile-option-terminate.sh
+++ b/t/py-compile-option-terminate.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that a non-option argument and the '--' special argument
# explicitly terminate the option list for 'py-compile'.
diff --git a/t/py-compile-usage.sh b/t/py-compile-usage.sh
index fc5d001ca..57574a4c0 100644
--- a/t/py-compile-usage.sh
+++ b/t/py-compile-usage.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test 'py-compile --help', 'py-compile --version', and that 'py-compile'
# correctly complains on wrong usage.
diff --git a/t/python-am-path-iftrue.sh b/t/python-am-path-iftrue.sh
index cc6443898..be837ed9c 100644
--- a/t/python-am-path-iftrue.sh
+++ b/t/python-am-path-iftrue.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test ACTION-IF-TRUE in AM_PATH_PYTHON.
diff --git a/t/python-dist.sh b/t/python-dist.sh
index 856b63425..6233746b1 100644
--- a/t/python-dist.sh
+++ b/t/python-dist.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test distribution of *_PYTHON files.
diff --git a/t/python-missing.sh b/t/python-missing.sh
index 4567ed291..608d92360 100644
--- a/t/python-missing.sh
+++ b/t/python-missing.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test detection of missing Python.
# See also related test t/python-am-path-missing-2.sh (which requires
diff --git a/t/python-pr10995.sh b/t/python-pr10995.sh
index ff60755b0..de751903e 100644
--- a/t/python-pr10995.sh
+++ b/t/python-pr10995.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test automake bug#10995: am__py_compile doesn't get correctly defined
# when there a 'noinst_PYTHON' declaration precedes a 'foo_PYTHON'
diff --git a/t/python-too-old.sh b/t/python-too-old.sh
index 97e5337b0..f74f26050 100644
--- a/t/python-too-old.sh
+++ b/t/python-too-old.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test detection of too old Python, also forcing the python to use.
# See also related test 't/python-am-path-missing.sh'.
diff --git a/t/python-vars.sh b/t/python-vars.sh
index d2b7b5ba3..e436915b2 100644
--- a/t/python-vars.sh
+++ b/t/python-vars.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that AM_PATH_PYTHON correctly sets all the output variables
# advertised in the manual.
diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh
index 0798ce786..5ec32f553 100644
--- a/t/python-virtualenv.sh
+++ b/t/python-virtualenv.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that python support can work well with virtualenvs.
# This test also works as a mild stress-test on the python support.
diff --git a/t/python.sh b/t/python.sh
index be8851869..a5c709d6a 100644
--- a/t/python.sh
+++ b/t/python.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure py_compile and am__py_compile are correctly defined.
diff --git a/t/python10.sh b/t/python10.sh
index 9074f79ec..863c2cee8 100644
--- a/t/python10.sh
+++ b/t/python10.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test _PYTHON with conditionals.
diff --git a/t/python11.sh b/t/python11.sh
index 349673396..305538478 100644
--- a/t/python11.sh
+++ b/t/python11.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test missing python.
diff --git a/t/python12.sh b/t/python12.sh
index f5153aafe..f804d84c1 100644
--- a/t/python12.sh
+++ b/t/python12.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure DESTDIR is not included in byte-compiled files.
diff --git a/t/python2.sh b/t/python2.sh
index f59e108fa..d97fe2910 100644
--- a/t/python2.sh
+++ b/t/python2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure that Automake suggests using AM_PATH_PYTHON.
diff --git a/t/python3.sh b/t/python3.sh
index b86ed91e1..2ddd4007f 100644
--- a/t/python3.sh
+++ b/t/python3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure we install built python files.
diff --git a/t/recurs-user-deeply-nested.sh b/t/recurs-user-deeply-nested.sh
index 401d9e4d4..8d2e32fb2 100644
--- a/t/recurs-user-deeply-nested.sh
+++ b/t/recurs-user-deeply-nested.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that recursion on user-defined targets can be made to work
# with "deeply" nested uses of $(SUBDIRS).
diff --git a/t/recurs-user-indir.sh b/t/recurs-user-indir.sh
index 1ae6f712c..858daf691 100644
--- a/t/recurs-user-indir.sh
+++ b/t/recurs-user-indir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that user recursion works with various types of indirections
# *involved in the definition of the '*-local' targets*: make macros,
diff --git a/t/recurs-user-keep-going.sh b/t/recurs-user-keep-going.sh
index f1b879d70..ee2f47f5d 100644
--- a/t/recurs-user-keep-going.sh
+++ b/t/recurs-user-keep-going.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that user recursion works with "make -k".
diff --git a/t/recurs-user-many.sh b/t/recurs-user-many.sh
index 989299e7b..c4a0f6481 100644
--- a/t/recurs-user-many.sh
+++ b/t/recurs-user-many.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that many user-defined recursive targets can be supported
# at once, and that calls to 'AM_EXTRA_RECURSIVE_TARGETS' are
diff --git a/t/recurs-user-no-subdirs.sh b/t/recurs-user-no-subdirs.sh
index b3398bd07..9c29d31ae 100644
--- a/t/recurs-user-no-subdirs.sh
+++ b/t/recurs-user-no-subdirs.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that user recursion can be made to work even when $(SUBDIRS)
# is empty or undefined.
diff --git a/t/recurs-user-no-top-level.sh b/t/recurs-user-no-top-level.sh
index 6975be92e..6f06e2c09 100644
--- a/t/recurs-user-no-top-level.sh
+++ b/t/recurs-user-no-top-level.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that user recursion works even for targets that don't exist
# in the top-level Makefile.
diff --git a/t/recurs-user-override.sh b/t/recurs-user-override.sh
index b4e98f397..67a963de8 100644
--- a/t/recurs-user-override.sh
+++ b/t/recurs-user-override.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that override of user-defined recursive targets work as
# expected.
diff --git a/t/recurs-user-phony.sh b/t/recurs-user-phony.sh
index dd4d19562..39b0f4893 100644
--- a/t/recurs-user-phony.sh
+++ b/t/recurs-user-phony.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that user-defined recursive targets and their associate
# '-local', '-am' and '-recursive' targets are declared as phony.
diff --git a/t/recurs-user-wrap.sh b/t/recurs-user-wrap.sh
index 70339afb1..a7f0c270b 100644
--- a/t/recurs-user-wrap.sh
+++ b/t/recurs-user-wrap.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that rules generated by user recursion are apt to be wrapped
# by other makefiles.
diff --git a/t/recurs-user.sh b/t/recurs-user.sh
index 310fd408e..a3f95ff45 100644
--- a/t/recurs-user.sh
+++ b/t/recurs-user.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Basic checks on user-defined recursive rules.
# Check that user recursion respect $(SUBDIRS) order,
diff --git a/t/recurs-user2.sh b/t/recurs-user2.sh
index 5090e045e..882a0d395 100644
--- a/t/recurs-user2.sh
+++ b/t/recurs-user2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that user recursion can be made to work when $(SUBDIRS) are
# not "strictly" nested, as in e.g.:
diff --git a/t/relativize.tap b/t/relativize.tap
index b65a1c0de..ad4ddf87e 100644
--- a/t/relativize.tap
+++ b/t/relativize.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test Automake-provided internal make macro $(am__relativize).
diff --git a/t/remake-aclocal-version-mismatch.sh b/t/remake-aclocal-version-mismatch.sh
index c8c90c8ef..7af5ef5b9 100644
--- a/t/remake-aclocal-version-mismatch.sh
+++ b/t/remake-aclocal-version-mismatch.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# See how well the rebuild rule handles an aclocal.m4 that was
# generated for another version of autoconf.
diff --git a/t/remake-after-acinclude-m4.sh b/t/remake-after-acinclude-m4.sh
index 5795080a6..182476d2e 100644
--- a/t/remake-after-acinclude-m4.sh
+++ b/t/remake-after-acinclude-m4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules when acinclude.m4 or its prerequisites change.
# Keep in sync with the other sister tests 'remake-after-*.sh'.
diff --git a/t/remake-after-aclocal-m4.sh b/t/remake-after-aclocal-m4.sh
index d955a40e7..11f10a4b5 100644
--- a/t/remake-after-aclocal-m4.sh
+++ b/t/remake-after-aclocal-m4.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules when aclocal.m4 or its prerequisites change.
# Keep in sync with the other sister tests 'remake-after-*.sh'.
diff --git a/t/remake-after-configure-ac.sh b/t/remake-after-configure-ac.sh
index d598f2294..0479c3952 100644
--- a/t/remake-after-configure-ac.sh
+++ b/t/remake-after-configure-ac.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules when configure.ac or its prerequisites change.
# Keep in sync with the other sister tests 'remake-after-*.sh'.
diff --git a/t/remake-after-makefile-am.sh b/t/remake-after-makefile-am.sh
index a758277f2..4585df0e3 100644
--- a/t/remake-after-makefile-am.sh
+++ b/t/remake-after-makefile-am.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules when Makefile.am or its prerequisites change.
# Keep in sync with the other sister tests 'remake-after-*.sh'.
diff --git a/t/remake-all-1.sh b/t/remake-all-1.sh
index b4e4a9a32..804e4807b 100644
--- a/t/remake-all-1.sh
+++ b/t/remake-all-1.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the "all" target triggers rebuilt of outdated Makefiles.
# See also sister test 'remake-all-2.sh'.
diff --git a/t/remake-all-2.sh b/t/remake-all-2.sh
index 4d94e8e05..649aaa584 100644
--- a/t/remake-all-2.sh
+++ b/t/remake-all-2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the "all" target triggers rebuilt of outdated makefiles.
# This handle the case in which the makefiles are not called 'Makefile'.
diff --git a/t/remake-am-pr10111.sh b/t/remake-am-pr10111.sh
index 3a7695e26..1f05c781d 100644
--- a/t/remake-am-pr10111.sh
+++ b/t/remake-am-pr10111.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that our remake rules doesn't give spurious successes in
# some corner case situations where they should actually fail.
diff --git a/t/remake-config-status-dependencies.sh b/t/remake-config-status-dependencies.sh
index 7eeaa2673..6802b48dd 100644
--- a/t/remake-config-status-dependencies.sh
+++ b/t/remake-config-status-dependencies.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test CONFIG_STATUS_DEPENDENCIES.
diff --git a/t/remake-configure-dependencies.sh b/t/remake-configure-dependencies.sh
index abbee9cc6..a27e68d4a 100644
--- a/t/remake-configure-dependencies.sh
+++ b/t/remake-configure-dependencies.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test CONFIGURE_DEPENDENCIES.
diff --git a/t/remake-deeply-nested.sh b/t/remake-deeply-nested.sh
index 7351a5a73..170b3831e 100644
--- a/t/remake-deeply-nested.sh
+++ b/t/remake-deeply-nested.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules in deeply nested subdirectories, and with a lot
# of files. This is basically a mild stress test, ensuring that rebuild
diff --git a/t/remake-deleted-am-2.sh b/t/remake-deleted-am-2.sh
index e2ea711a8..768feb623 100644
--- a/t/remake-deleted-am-2.sh
+++ b/t/remake-deleted-am-2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that inclusion of '.am' fragments by automake does not suffer
# of the "deleted header problem". This test checks deeper inclusion
diff --git a/t/remake-deleted-am-subdir.sh b/t/remake-deleted-am-subdir.sh
index 9f5dda46b..c7888ea66 100644
--- a/t/remake-deleted-am-subdir.sh
+++ b/t/remake-deleted-am-subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that inclusion of '.am' fragments by automake does not suffer
# of the "deleted header problem". This test does the check when the
diff --git a/t/remake-deleted-am.sh b/t/remake-deleted-am.sh
index cc5363081..2204ed898 100644
--- a/t/remake-deleted-am.sh
+++ b/t/remake-deleted-am.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that inclusion of '.am' fragments by automake does not suffer
# of the "deleted header problem". Basic checks are done here.
diff --git a/t/remake-deleted-m4-file.sh b/t/remake-deleted-m4-file.sh
index 72ba9ff17..b7d3bc256 100644
--- a/t/remake-deleted-m4-file.sh
+++ b/t/remake-deleted-m4-file.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules when an m4 file gets removed and the macros it
# defined get inlined into the caller. Try with both an indirect
diff --git a/t/remake-fail.sh b/t/remake-fail.sh
index ed1b64c6a..c83b4240c 100644
--- a/t/remake-fail.sh
+++ b/t/remake-fail.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure remaking rules fail when they should.
diff --git a/t/remake-gnulib-add-acsubst.sh b/t/remake-gnulib-add-acsubst.sh
index 19508a567..f23fd719d 100644
--- a/t/remake-gnulib-add-acsubst.sh
+++ b/t/remake-gnulib-add-acsubst.sh
@@ -12,13 +12,13 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules when a new AC_SUBST'd variable is added, and C header
# files are involved.
# This test overlaps with others, and is not strictly necessary per se,
# but it exercises a real use case (from gnulib, see:
-#
+#
# for more info).
required=cc
diff --git a/t/remake-gnulib-add-header.sh b/t/remake-gnulib-add-header.sh
index 51190a274..b1c2cd30e 100644
--- a/t/remake-gnulib-add-header.sh
+++ b/t/remake-gnulib-add-header.sh
@@ -12,13 +12,13 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules when a new C header "guarded" by AC_SUBST'd
# variables is added.
# This test overlaps with others, and is not strictly necessary per se,
# but it exercises a real use case (from gnulib, see:
-#
+#
# for more info).
required=cc
diff --git a/t/remake-gnulib-remove-header.sh b/t/remake-gnulib-remove-header.sh
index 36f5e2f71..3eae42954 100644
--- a/t/remake-gnulib-remove-header.sh
+++ b/t/remake-gnulib-remove-header.sh
@@ -12,14 +12,14 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules when a C header "guarded" by AC_SUBST'd variables
# is not needed anymore, or when it's needed again.
# This test requires some user-level machinery, overlaps with other tests,
# and is not strictly necessary per se, but it exercises a real, important
# use case (from gnulib, see:
-#
+#
# for more info).
required=cc
diff --git a/t/remake-include-aclocal.sh b/t/remake-include-aclocal.sh
index 6d476dc0e..f20456518 100644
--- a/t/remake-include-aclocal.sh
+++ b/t/remake-include-aclocal.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules for m4 files included (also recursively) by
# aclocal.m4. Keep in sync with sister tests:
diff --git a/t/remake-include-configure.sh b/t/remake-include-configure.sh
index 58c81de95..2227f3a53 100644
--- a/t/remake-include-configure.sh
+++ b/t/remake-include-configure.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules for m4 files included (also recursively) by
# configure.ac. Keep in sync with sister tests:
diff --git a/t/remake-include-makefile.sh b/t/remake-include-makefile.sh
index c551d726d..d3b3da0ee 100644
--- a/t/remake-include-makefile.sh
+++ b/t/remake-include-makefile.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules for am files included (also recursively) by
# Makefile.am. Keep in sync with sister tests:
diff --git a/t/remake-m4-pr10111.sh b/t/remake-m4-pr10111.sh
index c7fb2852e..b257b10a9 100644
--- a/t/remake-m4-pr10111.sh
+++ b/t/remake-m4-pr10111.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that our remake rules doesn't give spurious successes in
# some corner case situations where they should actually fail.
diff --git a/t/remake-macrodir.sh b/t/remake-macrodir.sh
index 2c1f92593..aa85e0a90 100644
--- a/t/remake-macrodir.sh
+++ b/t/remake-macrodir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the aclocal honouring of AC_CONFIG_MACRO_DIR interacts
# nicely with automatic rebuild rules.
diff --git a/t/remake-maintainer-mode.sh b/t/remake-maintainer-mode.sh
index afd2c1256..2c7012e5b 100644
--- a/t/remake-maintainer-mode.sh
+++ b/t/remake-maintainer-mode.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that AM_MAINTAINER_MODE disable some rebuild rules,
# but not all.
diff --git a/t/remake-makefile-intree.sh b/t/remake-makefile-intree.sh
index 990f113d9..d6bb3167f 100644
--- a/t/remake-makefile-intree.sh
+++ b/t/remake-makefile-intree.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test basic remake rules for Makefiles, for an *in-tree build*.
# This testcase checks dependency of generated Makefile from Makefile.am,
diff --git a/t/remake-makefile-vpath.sh b/t/remake-makefile-vpath.sh
index 596329061..6ec167187 100644
--- a/t/remake-makefile-vpath.sh
+++ b/t/remake-makefile-vpath.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test basic remake rules for Makefiles, for a *VPATH build*.
# This testcase checks dependency of generated Makefile from Makefile.am,
diff --git a/t/remake-mild-stress.sh b/t/remake-mild-stress.sh
index e5d88a242..ecbe3c60f 100644
--- a/t/remake-mild-stress.sh
+++ b/t/remake-mild-stress.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test basic remake rules for Makefiles with non-default names
# and/or with multiple sources.
diff --git a/t/remake-moved-m4-file.sh b/t/remake-moved-m4-file.sh
index 74fbd7fa3..2f3bce4e7 100644
--- a/t/remake-moved-m4-file.sh
+++ b/t/remake-moved-m4-file.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules when m4 files get moved among different "include
# dirs" (i.e. those passed to aclocal with '-I' option).
diff --git a/t/remake-not-after-make-dist.sh b/t/remake-not-after-make-dist.sh
index d8a5b5b8c..5f41c8d1b 100644
--- a/t/remake-not-after-make-dist.sh
+++ b/t/remake-not-after-make-dist.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure Makefile.in are up to date after make dist.
# This is expected to work even without GNU Make (the GNU Make
diff --git a/t/remake-recurs-user.sh b/t/remake-recurs-user.sh
index b8b60bbf4..665dc3d16 100644
--- a/t/remake-recurs-user.sh
+++ b/t/remake-recurs-user.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Remake rules and user-defined recursive rules.
diff --git a/t/remake-renamed-am.sh b/t/remake-renamed-am.sh
index 7f0e200df..2aa26c424 100644
--- a/t/remake-renamed-am.sh
+++ b/t/remake-renamed-am.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that inclusion of '.am' fragments by automake does not suffer
# of the "deleted header problem". This test checks that we can rename
diff --git a/t/remake-renamed-m4-file.sh b/t/remake-renamed-m4-file.sh
index 45a771376..616de2fba 100644
--- a/t/remake-renamed-m4-file.sh
+++ b/t/remake-renamed-m4-file.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules when m4 files get renamed.
diff --git a/t/remake-renamed-m4-macro-and-file.sh b/t/remake-renamed-m4-macro-and-file.sh
index b7a7f4d24..c839e4c4c 100644
--- a/t/remake-renamed-m4-macro-and-file.sh
+++ b/t/remake-renamed-m4-macro-and-file.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules when an m4 file gets renamed and *simultaneously*
# an m4 macro in it gets renamed. Kudos to Bruno Haible for thinking
diff --git a/t/remake-renamed-m4-macro.sh b/t/remake-renamed-m4-macro.sh
index c81a30ab2..cb8462f7b 100644
--- a/t/remake-renamed-m4-macro.sh
+++ b/t/remake-renamed-m4-macro.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test remake rules when the name of an m4 macro change. Try both with
# and without indirection.
diff --git a/t/remake-subdir-from-subdir.sh b/t/remake-subdir-from-subdir.sh
index 977b66ecb..c63de118c 100644
--- a/t/remake-subdir-from-subdir.sh
+++ b/t/remake-subdir-from-subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that remake rules works for adding a new subdirectory from a
# pre-existing subdirectory.
diff --git a/t/remake-subdir-gnu.sh b/t/remake-subdir-gnu.sh
index 19b35a0fe..cbc4aae55 100644
--- a/t/remake-subdir-gnu.sh
+++ b/t/remake-subdir-gnu.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that remake rules works from subdirectories, even using
# 'GNUmakefile' as makefiles name. This obviously requires GNU
diff --git a/t/remake-subdir-grepping.sh b/t/remake-subdir-grepping.sh
index bce74c77f..8c005e79c 100644
--- a/t/remake-subdir-grepping.sh
+++ b/t/remake-subdir-grepping.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Weak "grepping" test trying to ensure that remaking rules in a subdir
# are correctly generated.
diff --git a/t/remake-subdir-long-time.sh b/t/remake-subdir-long-time.sh
index b6937b0e0..e07dfa7a7 100644
--- a/t/remake-subdir-long-time.sh
+++ b/t/remake-subdir-long-time.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that remake rules from subdirectories do not hang or cycle
# endlessly, even with build systems that takes several seconds to
diff --git a/t/remake-subdir-no-makefile.sh b/t/remake-subdir-no-makefile.sh
index 7ec190285..bfe2705dc 100644
--- a/t/remake-subdir-no-makefile.sh
+++ b/t/remake-subdir-no-makefile.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Ensure that remake rules work for files in a subdirectory even when
# there is no Makefile for that subdirectory.
diff --git a/t/remake-subdir-only.sh b/t/remake-subdir-only.sh
index ad625d3a8..8a4bfaffd 100644
--- a/t/remake-subdir-only.sh
+++ b/t/remake-subdir-only.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure remaking rules in subdir are correctly generated.
# See also sister "grepping" test 'remake-subdir-grepping.sh'.
diff --git a/t/remake-subdir.sh b/t/remake-subdir.sh
index eb85d9a0c..7a5d0825a 100644
--- a/t/remake-subdir.sh
+++ b/t/remake-subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that remake rules works from subdirectories, even with non-GNU
# make implementations.
diff --git a/t/remake-subdir2.sh b/t/remake-subdir2.sh
index d62f22542..6ec23a49c 100644
--- a/t/remake-subdir2.sh
+++ b/t/remake-subdir2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that remake rules works from subdirectories, even when makefiles
# are not named "Makefile".
diff --git a/t/remake-subdir3.sh b/t/remake-subdir3.sh
index 0b51db70f..0dbd673fb 100644
--- a/t/remake-subdir3.sh
+++ b/t/remake-subdir3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Make sure remaking rules work when subdir Makefile.in has been removed.
diff --git a/t/remake-timing-bug-pr8365.sh b/t/remake-timing-bug-pr8365.sh
index f3fd57d2d..c94971e3c 100644
--- a/t/remake-timing-bug-pr8365.sh
+++ b/t/remake-timing-bug-pr8365.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test for automake bug#8365, related to Makefile remake rules.
# The bug is due to subtle timestamp issues and limitations in
diff --git a/t/repeated-options.sh b/t/repeated-options.sh
index 48fd6d832..d4c25bc7c 100644
--- a/t/repeated-options.sh
+++ b/t/repeated-options.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that automake does not complain on repeated options, nor
# generate broken or incorrect makefiles.
diff --git a/t/reqd2.sh b/t/reqd2.sh
index 600b6271b..42d575374 100644
--- a/t/reqd2.sh
+++ b/t/reqd2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Regression test for a bug reported by Andrew Suffield.
# (Automake goes wild and try to rerun itself more than two time
diff --git a/t/rm-f-probe.sh b/t/rm-f-probe.sh
index 81ff7b86e..d8389ce46 100644
--- a/t/rm-f-probe.sh
+++ b/t/rm-f-probe.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Verify our probe that checks that "rm -f" doesn't complain if called
# without file operands works as expected. See automake bug#10828.
diff --git a/t/rulepat.sh b/t/rulepat.sh
index 030ab1479..394520af9 100644
--- a/t/rulepat.sh
+++ b/t/rulepat.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure RULE_PATTERN catches strange targets.
diff --git a/t/sanity.sh b/t/sanity.sh
index a2dc21926..dee123aea 100644
--- a/t/sanity.sh
+++ b/t/sanity.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Unsafe absolute directory names should be diagnosed.
diff --git a/t/seenc.sh b/t/seenc.sh
index c8f85e94b..5cea239c4 100644
--- a/t/seenc.sh
+++ b/t/seenc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure C-but-not-CC error works.
diff --git a/t/self-check-cc-no-c-o.sh b/t/self-check-cc-no-c-o.sh
index 00ab2411a..115661465 100644
--- a/t/self-check-cc-no-c-o.sh
+++ b/t/self-check-cc-no-c-o.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that our fake "C compiler" that doesn't grasp the '-c' and
# '-o' command-line options passed together, used to enhance testsuite
diff --git a/t/self-check-configure-help.sh b/t/self-check-configure-help.sh
index cabef7572..1a72198ed 100644
--- a/t/self-check-configure-help.sh
+++ b/t/self-check-configure-help.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Sanity check on the function used by the automake testsuite to
# analyze output of "configure --help".
@@ -162,7 +162,7 @@ Use these variables to override the choices made by 'configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to .
-General help using GNU software: .
+General help using GNU software: .
END
compare_extracted_help ()
diff --git a/t/self-check-dir.tap b/t/self-check-dir.tap
index 8e3486924..a74921958 100644
--- a/t/self-check-dir.tap
+++ b/t/self-check-dir.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Sanity check for the automake testsuite.
# Check that tests using 'test-init.sh' create a proper temporary
diff --git a/t/self-check-exit.tap b/t/self-check-exit.tap
index 824badf0b..ca2ee7801 100644
--- a/t/self-check-exit.tap
+++ b/t/self-check-exit.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Sanity check for the automake testsuite.
# Check that, in case of failing commands, the correct exit status is
@@ -56,7 +56,7 @@ for sig in 1 2 13 15; do
if test $sig -eq 2; then
# Some Korn shells might otherwise get a spurious SIGINT when one is
# sent to the child $AM_TEST_RUNNER_SHELL. For more details, see:
- #
+ #
trap : 2
fi
$AM_TEST_RUNNER_SHELL -c "$init kill -$sig \$\$; :" "$dummy_test_script"
diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh
index c76944555..37d941dde 100644
--- a/t/self-check-explicit-skips.sh
+++ b/t/self-check-explicit-skips.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Sanity check for the automake testsuite.
# Check that our testsuite framework can be instructed not to consider
diff --git a/t/self-check-is-blocked-signal.tap b/t/self-check-is-blocked-signal.tap
index 0c17759e8..34160c976 100644
--- a/t/self-check-is-blocked-signal.tap
+++ b/t/self-check-is-blocked-signal.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Sanity check for the automake testsuite: the 'signal_is_blocked'
# shell function.
diff --git a/t/self-check-is_newest.tap b/t/self-check-is_newest.tap
index 95055181f..4b50dc329 100644
--- a/t/self-check-is_newest.tap
+++ b/t/self-check-is_newest.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Sanity check for the automake testsuite: the 'is_newest' subroutine.
diff --git a/t/self-check-me.tap b/t/self-check-me.tap
index 29328370e..c09d83b21 100644
--- a/t/self-check-me.tap
+++ b/t/self-check-me.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Sanity check for the automake testsuite.
# Make sure that $me gets automatically defined by 'test-init.sh'.
diff --git a/t/self-check-report.sh b/t/self-check-report.sh
index a5cd17e04..f110efe51 100644
--- a/t/self-check-report.sh
+++ b/t/self-check-report.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Sanity check for the automake testsuite.
# Test subroutines to report warnings, and to signal failures, skips
diff --git a/t/self-check-seq.tap b/t/self-check-seq.tap
index 734ad5d3a..078d49129 100644
--- a/t/self-check-seq.tap
+++ b/t/self-check-seq.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Sanity check for the automake testsuite.
# Check the 'seq_' subroutine.
diff --git a/t/self-check-shell-no-trail-bslash.sh b/t/self-check-shell-no-trail-bslash.sh
index 5003e2ef8..a0ef5b6f3 100644
--- a/t/self-check-shell-no-trail-bslash.sh
+++ b/t/self-check-shell-no-trail-bslash.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that our fake "shell" used to guard against use of trailing
# backslashes in recipes actually complains when those are used.
diff --git a/t/self-check-unindent.tap b/t/self-check-unindent.tap
index c8c18809c..109e2d49d 100644
--- a/t/self-check-unindent.tap
+++ b/t/self-check-unindent.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Sanity check for the automake testsuite.
# Check the 'unindent' subroutine.
diff --git a/t/serial-tests.sh b/t/serial-tests.sh
index 91aa52e8d..8a86638df 100644
--- a/t/serial-tests.sh
+++ b/t/serial-tests.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Option 'serial-tests'.
diff --git a/t/silent-c.sh b/t/silent-c.sh
index 36e34a274..00e691dd8 100644
--- a/t/silent-c.sh
+++ b/t/silent-c.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check silent-rules mode for C, without libtool, both with and without
# automatic dependency tracking.
diff --git a/t/silent-configsite.sh b/t/silent-configsite.sh
index 221368f0a..4a514ae4b 100644
--- a/t/silent-configsite.sh
+++ b/t/silent-configsite.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that the user can control default mode of silent-rules
# from config.site, and that this default can be overridden from
diff --git a/t/silent-custom.sh b/t/silent-custom.sh
index ac2c9823d..6f214183b 100644
--- a/t/silent-custom.sh
+++ b/t/silent-custom.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check user extensibility of silent-rules mode.
diff --git a/t/silent-cxx.sh b/t/silent-cxx.sh
index 58d32b990..462f2265b 100644
--- a/t/silent-cxx.sh
+++ b/t/silent-cxx.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check silent-rules mode for C++, both with and without automatic
# dependency tracking.
diff --git a/t/silent-f77.sh b/t/silent-f77.sh
index 9199ae418..37a3cb638 100644
--- a/t/silent-f77.sh
+++ b/t/silent-f77.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check silent-rules mode for Fortran 77.
# Keep this ins sync with the sister test 'silent-f90.sh'.
diff --git a/t/silent-f90.sh b/t/silent-f90.sh
index 5fbd8971a..6ace2a5c5 100644
--- a/t/silent-f90.sh
+++ b/t/silent-f90.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check silent-rules mode for Fortran 90.
# Keep this ins sync with the sister test 'silent-f77.sh'.
diff --git a/t/silent-gen.sh b/t/silent-gen.sh
index 3de5a3e0c..ff306db22 100644
--- a/t/silent-gen.sh
+++ b/t/silent-gen.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Silent rules: use of pre-defined variables $(AM_V_GEN) and $(AM_V_at).
# Incidentally, also check that silent rules are disabled by default.
diff --git a/t/silent-lex.sh b/t/silent-lex.sh
index 9fda9bafa..14ec086be 100644
--- a/t/silent-lex.sh
+++ b/t/silent-lex.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check silent-rules mode for Lex.
diff --git a/t/silent-lt.sh b/t/silent-lt.sh
index bd6bf7039..a5dbb00fe 100644
--- a/t/silent-lt.sh
+++ b/t/silent-lt.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check silent-rules mode for C, with libtool, both with and without
# automatic dependency tracking.
diff --git a/t/silent-many-languages.sh b/t/silent-many-languages.sh
index daab9eee3..d955aed22 100644
--- a/t/silent-many-languages.sh
+++ b/t/silent-many-languages.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check silent-rules mode, with many languages at once.
# This test partly overlaps with other 'silent*.sh', but it serves as
diff --git a/t/silent-nested-vars.sh b/t/silent-nested-vars.sh
index 321bf4c67..966ea9ab0 100644
--- a/t/silent-nested-vars.sh
+++ b/t/silent-nested-vars.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check silent-rules mode, on 'make' implementations that do not
# support nested variables (Bug#9928, Bug#10237).
diff --git a/t/silent-texi.sh b/t/silent-texi.sh
index 9e6ae3960..dc694f798 100644
--- a/t/silent-texi.sh
+++ b/t/silent-texi.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check texinfo rules in silent-rules mode.
diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh
index ff3ea3678..d0d5f5b74 100644
--- a/t/silent-yacc-headers.sh
+++ b/t/silent-yacc-headers.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check silent-rules mode for Yacc, when yacc-generated headers are
# involved (i.e., the '-d' option is in *YFLAGS).
diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh
index 48a4bd809..32b777212 100644
--- a/t/silent-yacc.sh
+++ b/t/silent-yacc.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check silent-rules mode for Yacc.
diff --git a/t/sourcefile-in-subdir.sh b/t/sourcefile-in-subdir.sh
index b197463ed..8a478e00a 100644
--- a/t/sourcefile-in-subdir.sh
+++ b/t/sourcefile-in-subdir.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure subdir source file generates explicit dependency.
diff --git a/t/space.sh b/t/space.sh
index 43698ff93..d20fc1b9f 100644
--- a/t/space.sh
+++ b/t/space.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test leading space on macro assignment.
diff --git a/t/specflg-dummy.sh b/t/specflg-dummy.sh
index f32e9d892..52344486c 100644
--- a/t/specflg-dummy.sh
+++ b/t/specflg-dummy.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check that even "dummy" per-target flags triggers the use of renamed
# objects. I.e., a definition like 'foo_CFLAGS = $(AM_CFLAGS)' should
diff --git a/t/specflg6.sh b/t/specflg6.sh
index c95322a3a..5c13f6bd5 100644
--- a/t/specflg6.sh
+++ b/t/specflg6.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Regression test for multiple rules being generated for each target when
# conditionals are present.
diff --git a/t/specflg7.sh b/t/specflg7.sh
index d226ba83c..78210a75f 100644
--- a/t/specflg7.sh
+++ b/t/specflg7.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# The true/false example from the manual, plus a check for _SHORTNAME.
diff --git a/t/specflg8.sh b/t/specflg8.sh
index 46d167b42..cf4cb8056 100644
--- a/t/specflg8.sh
+++ b/t/specflg8.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Like the true/false example from the manual,
# with one extra indirection in the sources (PR/315), and
diff --git a/t/specflg9.sh b/t/specflg9.sh
index 49218a5b8..4c10340e8 100644
--- a/t/specflg9.sh
+++ b/t/specflg9.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Another check for per-target flag substitutions.
diff --git a/t/spell.sh b/t/spell.sh
index 1d926abc6..cd9243e32 100644
--- a/t/spell.sh
+++ b/t/spell.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure misspellings in _SOURCES variables cause failure.
diff --git a/t/spell2.sh b/t/spell2.sh
index adc182447..88fd6775e 100644
--- a/t/spell2.sh
+++ b/t/spell2.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure misspellings in _SOURCES variables cause failure.
diff --git a/t/spell3.sh b/t/spell3.sh
index b6f0ef37e..ddd10fc54 100644
--- a/t/spell3.sh
+++ b/t/spell3.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure some internal _DEPENDENCIES variables don't cause
# errors.
diff --git a/t/spelling.sh b/t/spelling.sh
index e53ab6ef0..d56bc6966 100644
--- a/t/spelling.sh
+++ b/t/spelling.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Test to make sure that misspelled prefixes actually cause error.
diff --git a/t/spy-double-colon.sh b/t/spy-double-colon.sh
index f7b46c5a7..4dc89d49b 100644
--- a/t/spy-double-colon.sh
+++ b/t/spy-double-colon.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check whether double colon rules work. The Unix V7 make manual
# mentions double-colon rules, but POSIX does not. They seem to be
diff --git a/t/spy-rm.tap b/t/spy-rm.tap
index 0d9dee947..0f754cef2 100644
--- a/t/spy-rm.tap
+++ b/t/spy-rm.tap
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
# Check whether "rm -f" do not complain if called without file
# operands. We'd like to depend on this behaviour (which seems
@@ -21,7 +21,7 @@
# automake-provided cleanup rules.
# See automake bug#10828.
# Other references:
-#
+#
#
am_create_testdir=empty
diff --git a/t/src-acsubst.sh b/t/src-acsubst.sh
index c8a736601..cf5722e93 100644
--- a/t/src-acsubst.sh
+++ b/t/src-acsubst.sh
@@ -12,7 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see