From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 22 Sep 2011 14:40:40 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22e59ff1918b4165665d206a311f07dea264c83a;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  tests: fix tests on aclocal search path precedences
---

22e59ff1918b4165665d206a311f07dea264c83a
diff --cc ChangeLog
index d89b28071,47aee92b1..a6708864e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,9 +1,19 @@@
+ 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>
 +
 +	docs: remove mention of deprecated option `--acdir'
 +	* doc/automake.texi (aclocal Options): Remove mention of
 +	deprecated `--acdir' option.
 +
 +2011-09-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	* NEWS: Cleanup after botched merges.
 +
  2011-09-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	* NEWS: Fix typo.