X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bootstrap.sh;h=5add98a938dc1899c6acecd4cc9a49e750f9cb18;hb=e4a0b83273e5c51a4f8d6877407e117c4746d8ed;hp=541280ee0cf113908d39d8159e773a6cd5b7a3fb;hpb=57cb996d881ed6e835c2e6e1a5769e7fa9f1a6d0;p=platform%2Fupstream%2Fautomake.git diff --git a/bootstrap.sh b/bootstrap.sh index 541280e..5add98a 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