diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-08 17:12:38 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-09-08 17:14:26 +0200 |
| commit | eae542988e2cf151abd296864ee12dfee9c74c6d (patch) | |
| tree | 8efed982d1468d9dcf00c48eca3c5d1ea135505b /bootstrap | |
| parent | e1177186ff44b11d6c14d74637bb2564b84151d0 (diff) | |
| parent | 30f99cbd07736c96603d15346fc8ad9097a0dddd (diff) | |
| download | automake-eae542988e2cf151abd296864ee12dfee9c74c6d.tar.gz | |
Merge branch 'maint'
* maint:
aclocal: more granularity in acdir overriding
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -110,7 +110,9 @@ $BOOTSTRAP_SHELL ./instspc-tests.sh --generate-makefile > instspc-tests.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 |