summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-09-22 16:40:32 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2011-09-22 16:40:32 +0200
commitb9fa1fc1eb50d7907764ec0972a674548a7bd8b3 (patch)
tree5e41abfd44d94d7b9ccbee0f78e23a41f4887403
parent15721c4885b8f24ca9ce2c5f2c42899277a11261 (diff)
parent33805241126d1b087eb8af401a5f84cb33e88a3d (diff)
downloadautomake-b9fa1fc1eb50d7907764ec0972a674548a7bd8b3.tar.gz
Merge branch 'aclocal-path' into maint
* aclocal-path: tests: fix tests on aclocal search path precedences
-rw-r--r--ChangeLog6
-rwxr-xr-xtests/aclocal-path-precedence.test2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c12029c76..47aee92b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-22 Stefano Lattarini <stefano.lattarini@gmail.com>
+
+ tests: fix tests on aclocal search path precedences
+ * tests/aclocal-path-precedence.test: Call `$ACLOCAL' with the
+ proper overridden system acdir.
+
2011-09-20 Stefano Lattarini <stefano.lattarini@gmail.com>
* NEWS: Fix typo.
diff --git a/tests/aclocal-path-precedence.test b/tests/aclocal-path-precedence.test
index 0378fb2d0..b170dd5f3 100755
--- a/tests/aclocal-path-precedence.test
+++ b/tests/aclocal-path-precedence.test
@@ -64,7 +64,7 @@ END
echo ./extradir > sysdir/dirlist
-ACLOCAL_PATH=mdir1:mdir2 $ACLOCAL -I mdir3
+ACLOCAL_PATH=mdir1:mdir2 $ACLOCAL -I mdir3 --system-acdir sysdir
$AUTOCONF
$FGREP '::' configure # For debugging.