From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 4 Apr 2012 09:56:19 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da7bbf1eb5315d2bc6e94cbc2f7a106b214bd645;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  texinfo: warn about future use of '--tidy'
  texinfo: don't clutter the builddir when using modern texi2dvi
  hacking: autotools-generated files are not committed anymore
  hacking: simplify documentation of bootstrapping process
  cosmetics: remove repeated line in comment, fix quoting
  cosmetics: remove useless import in automake script
  docs: deprecate 'cygnus' mode, help the transition
  perl refactor: use modern semantics of 'open'
  cosmetics: don't make the generated Config.pm executable
  maint: reduce use of recursion in automake build system
  news: sync with branch-1.11, fix mis-merges
  acinstall: remove, it has never been really used
  maint: reorganize the source tree and make it less cluttered
  news: we are going to drop 'cygnus' soonish

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

da7bbf1eb5315d2bc6e94cbc2f7a106b214bd645
diff --cc Makefile.am
index 723169826,985e7da2e..005512b72
--- a/Makefile.am
+++ b/Makefile.am
@@@ -34,19 -36,18 +36,19 @@@ EXTRA_DIST = 
    GNUmakefile \
    syntax-checks.mk \
    HACKING \
 +  NG-NEWS \
-   ChangeLog.96 \
-   ChangeLog.98 \
-   ChangeLog.00 \
-   ChangeLog.01 \
-   ChangeLog.02 \
-   ChangeLog.03 \
-   ChangeLog.04 \
-   ChangeLog.09 \
-   ChangeLog.11 \
-   bootstrap \
    $(gitlog_to_changelog_fixes) \
-   $(AUTOMAKESOURCES)
+   old/ChangeLog-tests \
+   old/ChangeLog.96 \
+   old/ChangeLog.98 \
+   old/ChangeLog.00 \
+   old/ChangeLog.01 \
+   old/ChangeLog.02 \
+   old/ChangeLog.03 \
+   old/ChangeLog.04 \
+   old/ChangeLog.09 \
+   old/ChangeLog.11 \
+   old/TODO
  
  ## Make versioned links.  We only run the transform on the root name;
  ## then we make a versioned link with the transformed base name.  This
@@@ -105,9 -106,14 +107,14 @@@ INSTALL: lib/INSTAL
  
  # Convenience proxy target for the test suites.
  recheck:
 -	$(am__cd) tests && $(MAKE) $(AM_MAKEFLAGS) $@
 +	$(am__cd) tests && $(MAKE) $@
  .PHONY: recheck
  
+ # We don't use the default name for the autom4te cache directory,
+ # so we need this.
+ maintainer-clean-local:
+ 	rm -rf .autom4te.cache
+ 
  ################################################################
  ##
  ## Everything past here is useful to the maintainer, but probably not