diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-08 17:58:00 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-08 17:58:00 +0200 |
| commit | 6cf4d911da8414ffdd161daf7648704fd2beacb6 (patch) | |
| tree | fd7c9d5021bf04f1c80214d77296aaf492f3b78f /bootstrap | |
| parent | 03f4a090c023339ed268e5c13c3fab00c37fdb36 (diff) | |
| parent | 95d11c290f223a8aa3f3e2e3474020e8a10585aa (diff) | |
| download | automake-6cf4d911da8414ffdd161daf7648704fd2beacb6.tar.gz | |
Merge branch 'test-protocols' into testsuite-work
* test-protocols:
aclocal: more granularity in acdir overriding
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -111,7 +111,9 @@ mv -f testsuite-part.tmp testsuite-part.am cd .. # Run the autotools. -$PERL ./aclocal.tmp -I m4 +# Use `-I' here so that our own *.m4 files in m4/ gets included, +# not copied, in aclocal.m4. +$PERL ./aclocal.tmp -I m4 --automake-acdir m4 --system-acdir m4/acdir $AUTOCONF $PERL ./automake.tmp |