diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-09 11:57:20 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-09 12:33:55 +0200 |
commit | ce70cf4b95a486f712fab0af865f6c005139fafe (patch) | |
tree | 52734713b9e253aee7584a071ecb239e72299abf /bootstrap.sh | |
parent | c8f106c772e608b25aa6a3aa8eeeb0119e097ab2 (diff) | |
download | automake-ce70cf4b95a486f712fab0af865f6c005139fafe.tar.gz |
build: move automake and aclocal in 'bin' subdir
* automake.in: Rename ...
* bin/automake.in: ... like this.
* aclocal.in: Rename ...
* bin/aclocal.in: ... like this.
* Makefile.am: Move parts that dealt with the building/distribution
of aclocal and Automake ..
* bin/Makefile.inc): ... in this new included fragment. Adjust as
needed, and make deliberate use of the '%D%' substitution.
* lib/gen-perl-protos: Move ...
* bin/gen-perl-protos: ... here.
* bootstrap.sh, configure.ac, maintainer/rename-tests,
t/wrap/aclocal.in, t/wrap/automake.in, doc/Makefile.inc,
t/ax/tap-setup.sh, .gitignore: Adjust.
* maintainer/syntax-checks.mk: Likewise, and enhance a little.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'bootstrap.sh')
-rwxr-xr-x | bootstrap.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 541280ee0..5add98a93 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -99,9 +99,9 @@ dosubst automake-$APIVERSION/Automake/Config.in \ dosubst m4/amversion.in m4/amversion.m4 # Create temporary replacement for aclocal and automake. -for p in aclocal automake; do +for p in bin/aclocal bin/automake; do dosubst $p.in $p.tmp - $PERL -w lib/gen-perl-protos $p.tmp > $p.tmp2 + $PERL -w bin/gen-perl-protos $p.tmp > $p.tmp2 mv -f $p.tmp2 $p.tmp done @@ -113,11 +113,11 @@ mv -f t/testsuite-part.tmp t/testsuite-part.am # Run the autotools. Bail out if any warning is triggered. # Use '-I' here so that our own *.m4 files in m4/ gets included, # not copied, in aclocal.m4. -$PERL ./aclocal.tmp -Wall -Werror -I m4 \ - --automake-acdir=m4 --system-acdir=m4/acdir +$PERL ./bin/aclocal.tmp -Wall -Werror -I m4 \ + --automake-acdir=m4 --system-acdir=m4/acdir $AUTOCONF -Wall -Werror -$PERL ./automake.tmp -Wall -Werror +$PERL ./bin/automake.tmp -Wall -Werror # Remove temporary files and directories. rm -rf aclocal-$APIVERSION automake-$APIVERSION -rm -f aclocal.tmp automake.tmp +rm -f bin/aclocal.tmp bin/automake.tmp |