Merge branch 'maint' into msvc
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 27 Dec 2011 21:14:53 +0000 (22:14 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 27 Dec 2011 21:14:53 +0000 (22:14 +0100)
* 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

1  2 
ChangeLog
NEWS
doc/automake.texi
lib/Makefile.am
tests/Makefile.am
tests/subpkg.test

diff --cc ChangeLog
Simple merge
diff --cc NEWS
Simple merge
Simple merge
diff --cc 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)
Simple merge
Simple merge