diff options
author | Mathieu Lirzin <mthl@gnu.org> | 2018-02-25 23:03:05 +0100 |
---|---|---|
committer | Mathieu Lirzin <mthl@gnu.org> | 2018-02-25 23:03:05 +0100 |
commit | be971a1d87d84d94cc073fcd5dbc6e7105b4d011 (patch) | |
tree | f530fc501658a6cc29d10fa3d5d9c1c08b193766 /t/ax/test-defs.in | |
parent | 9ec19184fe3df21f20417c4f73ffe46f9610b5c7 (diff) | |
parent | 4f73bb80d1583441ed4a1c681a843fe4d9d5e26c (diff) | |
download | automake-maint.tar.gz |
Merge branch 'release' into maintmaint
Diffstat (limited to 't/ax/test-defs.in')
-rw-r--r-- | t/ax/test-defs.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in index 2465c61c1..5dc2a61af 100644 --- a/t/ax/test-defs.in +++ b/t/ax/test-defs.in @@ -1,7 +1,7 @@ # -*- shell-script -*- # @configure_input@ # -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -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 <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # Defines and minimal setup for Automake testing environment. @@ -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_bindir=$am_top_builddir/t/wrap + 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" @@ -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 <http://www.gnu.org/gnu/initial-announcement.html>. +# in UTC; see <https://www.gnu.org/gnu/initial-announcement.html>. old_timestamp=198309271735.59 # Make our wrapper script (or installed scripts, if running under |