summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
Diffstat (limited to 't')
-rw-r--r--t/Makefile.inc4
-rw-r--r--t/ax/test-defs.in2
-rw-r--r--t/get-sysconf.sh4
-rw-r--r--t/wrap/aclocal.in29
-rw-r--r--t/wrap/automake.in27
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';