[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1039-g22e59ff

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=22e59ff1918b4165665d206a311f07dea264c83a

The branch, master has been updated
       via  22e59ff1918b4165665d206a311f07dea264c83a (commit)
       via  b9fa1fc1eb50d7907764ec0972a674548a7bd8b3 (commit)
       via  33805241126d1b087eb8af401a5f84cb33e88a3d (commit)
      from  cb387adeb06f92656007a4983b23c077f7843de7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 22e59ff1918b4165665d206a311f07dea264c83a
Merge: cb387ad b9fa1fc
Author: Stefano Lattarini <address@hidden>
Date:   Thu Sep 22 16:40:40 2011 +0200

    Merge branch 'maint'
    
    * maint:
      tests: fix tests on aclocal search path precedences

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                          |    6 ++++++
 tests/aclocal-path-precedence.test |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d89b280..a670886 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-22  Stefano Lattarini  <address@hidden>
+
+       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  <address@hidden>
 
        docs: remove mention of deprecated option `--acdir'
diff --git a/tests/aclocal-path-precedence.test 
b/tests/aclocal-path-precedence.test
index 0378fb2..b170dd5 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.


hooks/post-receive
-- 
GNU Automake