diff options
author | Mathieu Lirzin <mthl@gnu.org> | 2017-08-29 11:27:52 +0200 |
---|---|---|
committer | Mathieu Lirzin <mthl@gnu.org> | 2017-08-29 12:27:11 +0200 |
commit | bb64793a95ea0576c817a8e01f0a689d9547de4a (patch) | |
tree | 51d47cffe798f1822e971fce095bacc4175c9029 /t | |
parent | 5521219348c55af354878583b99c5f9d66d6d38a (diff) | |
download | automake-bb64793a95ea0576c817a8e01f0a689d9547de4a.tar.gz |
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.
Diffstat (limited to 't')
-rw-r--r-- | t/Makefile.inc | 4 | ||||
-rw-r--r-- | t/ax/test-defs.in | 2 | ||||
-rw-r--r-- | t/get-sysconf.sh | 4 | ||||
-rw-r--r-- | t/wrap/aclocal.in | 29 | ||||
-rw-r--r-- | t/wrap/automake.in | 27 |
5 files changed, 3 insertions, 63 deletions
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 <http://www.gnu.org/licenses/>. - -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 <http://www.gnu.org/licenses/>. - -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'; |