From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 27 Dec 2011 21:14:53 +0000 (+0100)
Subject: Merge branch 'maint' into msvc
X-Git-Tag: v1.11.2b~12^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cec0f63c97df20bb559851ed04186dbb902cc07;p=thirdparty%2Fautomake.git

Merge branch 'maint' into msvc

* maint:
  tests: drop unnecessary requirement in 'subpkg.test'
  gitlog-to-changelog: new auxiliary script, synced from gnulib
  docs: "aclocal --install -I /abs/dir" actually copies files
  docs: fix node names for automake and aclocal invocations
---

3cec0f63c97df20bb559851ed04186dbb902cc07
diff --cc lib/Makefile.am
index 5bdc02e13,410282857..f4acc8afe
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -29,9 -28,9 +29,9 @@@ dist_pkgvdata_DATA = COPYING INSTALL te
  scriptdir = $(pkgvdatadir)
  dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \
    mkinstalldirs elisp-comp ylwrap acinstall depcomp compile py-compile \
 -  symlink-tree
 +  symlink-tree ar-lib
  
- EXTRA_DIST = gnupload
+ EXTRA_DIST = gnupload gitlog-to-changelog
  
  install-data-hook:
  	@$(POST_INSTALL)