From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 6 Oct 2011 19:42:06 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30eb17ff6ebb7d3c3904f7f65ded96a9568dbcd7;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

30eb17ff6ebb7d3c3904f7f65ded96a9568dbcd7
diff --cc Makefile.in
index 64664180e,9a0303599..24a6c7fe1
--- a/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 4055e58d5,0080df815..b69884a97
mode 100644,100755..100644
--- a/automake.in
+++ b/automake.in