From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 2 Jan 2011 05:12:13 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9ab6dd38be370a76db85c32e0c0ab9e7189eed6;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

b9ab6dd38be370a76db85c32e0c0ab9e7189eed6
diff --cc ChangeLog
index 7fbb38934,22bd532bf..472dc5578
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,9 +1,14 @@@
  2011-01-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
+ 	Sync auxiliary files from upstream.
+ 	* lib/config.guess, lib/config.sub, lib/texinfo.tex:
+ 	Sync from upstream.
+ 
 +	Avoid caching bug in cygnus mode test.
 +	* tests/cygnus-requires-maintainer-mode.test: Remove
 +	autom4te.cache directory before rerunning aclocal, to
 +	remove trace caches.
 +
  	Fix maintainer-check regression.
  	* tests/subobj11a.test: Pass DISTCHECK_CONFIGURE_FLAGS in the
  	environment.