Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -738,7 +738,7 @@ dist_autoconflib_DATA = \
   lib/autoconf/programs.m4 \
   lib/autoconf/trailer.m4
 
-nodist_autoconflib_DATA = lib/autoconf/autoconf.m4f
+nodist_autoconflib_DATA = 
 autoscanlibdir = $(pkgdatadir)/autoscan
 nodist_autoscanlib_DATA = lib/autoscan/autoscan.list
 m4sugarlibdir = $(pkgdatadir)/m4sugar
@@ -748,9 +748,7 @@ dist_m4sugarlib_DATA = \
   lib/m4sugar/m4sh.m4
 
 nodist_m4sugarlib_DATA = \
-  lib/m4sugar/version.m4 \
-  lib/m4sugar/m4sugar.m4f \
-  lib/m4sugar/m4sh.m4f
+  lib/m4sugar/version.m4
 
 autotestlibdir = $(pkgdatadir)/autotest
 dist_autotestlib_DATA = \
@@ -758,7 +756,7 @@ dist_autotestlib_DATA = \
   lib/autotest/general.m4 \
   lib/autotest/specific.m4
 
-nodist_autotestlib_DATA = lib/autotest/autotest.m4f
+nodist_autotestlib_DATA = 
 
 # These are declared as _DATA so that they are not subject to
 # --program-transform-name; $(pkgdatadir) is sufficient to keep
@@ -1201,6 +1199,10 @@ dist-info: $(INFO_DEPS)
 	  for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
 	    if test -f $$file; then \
 	      relfile=`expr "$$file" : "$$d/\(.*\)"`; \
+	      ext=`echo $$relfile | sed -e 's/^.*\\.//'`; \
+	      relfile=`echo $$relfile | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	      relfile=`echo $$relfile | sed -e 's/^.*\///'`; \
+	      relfile=`echo $$relfile | sed '$(transform)'`.$$ext; \
 	      test -f "$(distdir)/$$relfile" || \
 		cp -p $$file "$(distdir)/$$relfile"; \
 	    else :; fi; \
@@ -1532,6 +1534,7 @@ install-pkgdataDATA: $(pkgdata_DATA)
 	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
+	  p=`basename $$p`; \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
@@ -1924,18 +1927,25 @@ install-info-am: $(INFO_DEPS)
 	  for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
 	               $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
 	    if test -f $$ifile; then \
-	      echo "$$ifile"; \
+	      relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
+ 	      ext=`echo $$relfile | sed -e 's/^.*\\.//'`; \
+ 	      relfile=`echo $$relfile | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	      relfile=`echo $$relfile | sed -e 's/^.*\///'`; \
+ 	      relfile=`echo $$relfile | sed '$(transform)'`.$$ext; \
+	      echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
+	      $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
 	    else : ; fi; \
 	  done; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
+	done
 	@$(POST_INSTALL)
 	@if $(am__can_run_installinfo); then \
 	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
+ 	    ext=`echo $$relfile | sed -e 's/^.*\\.//'`; \
+ 	    relfile=`echo $$relfile | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	    relfile=`echo $$relfile | sed -e 's/^.*\///'`; \
+ 	    relfile=`echo $$relfile | sed '$(transform)'`.$$ext; \
 	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
 	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
 	  done; \
@@ -2267,8 +2277,7 @@ $(wrappers): tests/wrapper.in
 	mv -f $@.tmp $@
 $(TESTSUITE): tests/package.m4 \
 	      tests/local.at \
-	      $(TESTSUITE_AT) \
-	      lib/autotest/autotest.m4f
+	      $(TESTSUITE_AT)
 	$(AUTOTEST) $(AUTOTESTFLAGS) suite.at -o $@.tmp
 	mv $@.tmp $@
 $(distclean_generic): clean-local
