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 /bin | |
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 'bin')
-rw-r--r-- | bin/Makefile.inc | 4 | ||||
-rw-r--r-- | bin/wrap-aclocal.in | 29 | ||||
-rw-r--r-- | bin/wrap-automake.in | 27 |
3 files changed, 60 insertions, 0 deletions
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 <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/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 <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'; |