From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 3 Nov 2011 10:39:40 +0000 (+0100)
Subject: Merge branch 'maint' into msvc
X-Git-Tag: ng-0.5a~101^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2270535f37084e0e2febed21cd808da75b0f3451;p=thirdparty%2Fautomake.git

Merge branch 'maint' into msvc

* maint:
  maint-mode: fix botched configure messages
  fix: regenerate Makefiles
  info: allow user to inhibit creation/update of '${infodir}/dir'
  deps: partially revert commit `v1.11-512-geeee551'
---

2270535f37084e0e2febed21cd808da75b0f3451
diff --cc ChangeLog
index fb29ef7c3,d7804966a..bd0a16521
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,26 -1,60 +1,83 @@@
+ 2011-11-03  Zack Weinberg <zackw@panix.com>  (tiny change)
+ 	    Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	maint-mode: fix botched configure messages
+ 	This change fixes automake bug#9890.
+ 	* m4/maintainer.m4 (AM_MAINTAINER_MODE): Fix the "checking ..."
+ 	configure message related to the enabling/disabling of maintainer
+ 	mode.
+ 	* tests/help-maintainer.test: Renamed ...
+ 	* tests/maintmode-configure-msg.test: ... to this, and extended
+ 	to cover the fixed bug.  Also, since we are at it, make grepping
+ 	of configure help screens stricter, and throw in some few other
+ 	changes to reduce code duplication and enhance readability.
+ 	* tests/Makefile.am (TESTS): Update.
+ 	* THANKS: Update with Zack's new e-mail address.
+ 	Report and initial patch by Zack Weinberg, test cases added by
+ 	Stefano Lattarini.
+ 
+ 2011-10-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	info: allow user to inhibit creation/update of '${infodir}/dir'
+ 	With this change, we allow the user to request the install-info
+ 	rules not to update the `${infodir}/dir' file, by exporting the
+ 	environment variable `AM_UPDATE_INFO_DIR' to the value "no".
+ 	This is especially useful to distro packagers, and is a definite
+ 	improvement over our previous hack of looking whether the
+ 	`install-info' program was the Debian or GNU version -- hack
+ 	which had been silently broken with recent versions of debian
+ 	install-info BTW (probably since dpkg 1.15.4, 2009-09-06).
+ 	This change fixes automake bug#9773.  See also Debian Bug#543992.
+ 	* lib/am/texinfos.am: Don't look anymore at the output of
+ 	`install-info --version' to decide whether to use it to update
+ 	the `${infodir}/dir' or not; instead, honour the environment
+ 	variable `AM_UPDATE_INFO_DIR'.
+ 	* tests/install-info-dir.test: New test.
+ 	* tests/Makefile.am (TESTS): Add it.
+ 	* tests/defs: Also unset `AM_UPDATE_INFO_DIR', to avoid unwanted
+ 	interferences from the environment.
+ 	* doc/automake.texi (Texinfo): Update.
+ 	* NEWS: Likewise.
+ 	* THANKS: Likewise.
+ 	Report by Jonathan Nieder.
+ 
+ 2011-10-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	deps: partially revert commit `v1.11-512-geeee551'
+ 	This change partly reverts commit "Create subdirs for generated
+ 	sources even when not dep tracking", of 2011-04-02.
+ 	That commit had caused the bugs #8485 and #8526.  Since we are
+ 	nearing the bug-fixing automake release 1.11.2, the safest policy
+ 	at the moment is to just revert the problematic hunks: an older,
+ 	known bug is better than a regression.
+ 	* automake.in (handle_single_transform): Don't add a dirstamp
+ 	dependency, even when $object is derived and lands in a subdir.
+ 	* tests/Makefile.am (XFAIL_TESTS): Add lex-subobj-nodep.test,
+ 	remove yacc-dist-nobuild-subdir.test.
+ 
 +2011-10-25  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	tests: few improvements to some `ar-lib' related tests
 +
 +	* tests/ar-lib5a.test (Makefile.am): Also check that the target
 +	library has truly been created.
 +	(ar-lib): Use the real `ar-lib' script (mildly patched) rather
 +	than a dummy one, to ensure better "real-life coverage".  Fix
 +	botched shebang line.
 +	* tests/ar-lib5b.test: Extend the PATH variable to make the dummy
 +	`lib' script accessible, instead of explicitly calling it by its
 +	relative/absolute path.
 +	(ar-lib): Fix botched shebang line.
 +	(bin/lib): Likewise.  Also, add explicative comments, and make
 +	slightly stricter.
 +
 +2011-10-24  Peter Rosin  <peda@lysator.liu.se>
 +
 +	Merge branch 'maint' into msvc
 +
 +	* tests/subpkg-yacc.test: Adjust to new portability requirements due
 +	to the new AM_PROG_AR macro.
 +
  2011-10-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	dejagnu: allow the package developer to extend site.exp