Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc Makefile.in
index 64664180e8bcbfba6ffb2171053c0f703dbfc1c2,9a03035999c258ce018552a26c082df0af9269fc..24a6c7fe1acf21ea654d51c6cd5ef4745f109c50
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -158,10 -150,9 +158,10 @@@ am__relativize = 
    reldir="$$dir2"
  DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
  GZIP_ENV = --best
 +DIST_TARGETS = dist-bzip2 dist-gzip
  distuninstallcheck_listfiles = find . -type f -print
  am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-   | sed 's|^\./|${prefix}/|' | grep -v '${infodir}/dir$$'
+   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
  distcleancheck_listfiles = find . -type f -print
  ACLOCAL = @ACLOCAL@
  AMTAR = @AMTAR@

diff --cc automake.in
index 4055e58d50676c13b17607a65264bfbc70f5613c,0080df8154e3e71dd032bb54926c15353e882f20..b69884a972fd0adc30123b9d42989a67e839ad82
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

diff --cc lib/am/distdir.am
Simple merge

diff --cc tests/insthook.test
Simple merge