From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 20 Sep 2008 15:33:29 +0000 (+0200)
Subject: Remove unneeded per-rule *INSTALL variables.
X-Git-Tag: v1.10b~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4792c5dfd78723d57e8b45d77cae50c5d1e16d54;p=thirdparty%2Fautomake.git

Remove unneeded per-rule *INSTALL variables.

* NEWS: Update.
* lib/am/data.am (%DIR%%PRIMARY%_INSTALL): Remove.
(install-%DIR%%PRIMARY%): Adjust.
* lib/am/libs.am (%DIR%LIBRARIES_INSTALL): Remove.
(install-%DIR%LIBRARIES): Adjust.
* lib/am/ltlibs.am (%DIR%LTLIBRARIES_INSTALL): Remove.
(install-%DIR%LTLIBRARIES): Adjust.
* lib/am/progs.am (%DIR%PROGRAMS_INSTALL): Remove.
(install-%DIR%PROGRAMS): Adjust.
* lib/am/python.am (%DIR%PYTHON_INSTALL): Remove.
(install-%DIR%PYTHON): Adjust.
* lib/am/scripts.am (%DIR%SCRIPT_INSTALL): Remove.
(install-%DIR%SCRIPTS): Adjust.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index e9053e9ad..33b8f0277 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2008-09-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Remove unneeded per-rule *INSTALL variables.
+	* NEWS: Update.
+	* lib/am/data.am (%DIR%%PRIMARY%_INSTALL): Remove.
+	(install-%DIR%%PRIMARY%): Adjust.
+	* lib/am/libs.am (%DIR%LIBRARIES_INSTALL): Remove.
+	(install-%DIR%LIBRARIES): Adjust.
+	* lib/am/ltlibs.am (%DIR%LTLIBRARIES_INSTALL): Remove.
+	(install-%DIR%LTLIBRARIES): Adjust.
+	* lib/am/progs.am (%DIR%PROGRAMS_INSTALL): Remove.
+	(install-%DIR%PROGRAMS): Adjust.
+	* lib/am/python.am (%DIR%PYTHON_INSTALL): Remove.
+	(install-%DIR%PYTHON): Adjust.
+	* lib/am/scripts.am (%DIR%SCRIPT_INSTALL): Remove.
+	(install-%DIR%SCRIPTS): Adjust.
+
 	Compactify program rules using ternary operators.
 	* lib/am/progs.am (install-%DIR%PROGRAMS): Uglify^WCompactify
 	using ternary operators `%KEY?TRUE:FALSE%'.
diff --git a/Makefile.in b/Makefile.in
index e29956ea4..c2f487057 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,7 +74,6 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(bindir)"
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
 SOURCES =
 DIST_SOURCES =
@@ -309,8 +308,8 @@ install-binSCRIPTS: $(bin_SCRIPTS)
 	while read type dir files; do \
 	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	     test -z "$$files" || { \
-	       echo " $(binSCRIPT_INSTALL) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	       $(binSCRIPT_INSTALL) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
 	     } \
 	; done
 
diff --git a/NEWS b/NEWS
index dddf0a20b..ee84444f1 100644
--- a/NEWS
+++ b/NEWS
@@ -71,6 +71,13 @@ New in 1.10a:
     due to the use of associative arrays in awk.  The increased use of
     awk matches a similar move in Autoconf to provide for better scaling.
 
+    Further, most undocumented per-rule install command variables such as
+    binSCRIPT_INSTALL have been removed because they are not needed any
+    more.  Packages which use them should be using the appropriate one of
+    INSTALL_{DATA,PROGRAM,SCRIPT} or their install_sh_{DATA,PROGRAM,SCRIPT}
+    counterpart, depending on the type of files and the need for automatic
+    target directory creation.
+
   - The "deleted header file problem" for *.m4 files is avoided by
     stub rules.  This allows `make' to trigger a rerun of `aclocal'
     also if some previously needed macro file has been removed.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d4e4f1444..d98e14d80 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -92,7 +92,6 @@ am__base_list = \
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(dist_man1_MANS)
-dist_docDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_doc_DATA) $(dist_noinst_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -458,8 +457,8 @@ install-dist_docDATA: $(dist_doc_DATA)
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(dist_docDATA_INSTALL) $$files '$(DESTDIR)$(docdir)'"; \
-	  $(dist_docDATA_INSTALL) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
 	done
 
 uninstall-dist_docDATA:
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 29975cee5..7a20ca307 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -80,8 +80,6 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(perllibdir)"
-dist_perllibDATA_INSTALL = $(INSTALL_DATA)
-nodist_perllibDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_perllib_DATA) $(nodist_perllib_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -278,8 +276,8 @@ install-dist_perllibDATA: $(dist_perllib_DATA)
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(dist_perllibDATA_INSTALL) $$files '$(DESTDIR)$(perllibdir)'"; \
-	  $(dist_perllibDATA_INSTALL) $$files "$(DESTDIR)$(perllibdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(perllibdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(perllibdir)" || exit $$?; \
 	done
 
 uninstall-dist_perllibDATA:
@@ -297,8 +295,8 @@ install-nodist_perllibDATA: $(nodist_perllib_DATA)
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(nodist_perllibDATA_INSTALL) $$files '$(DESTDIR)$(perllibdir)'"; \
-	  $(nodist_perllibDATA_INSTALL) $$files "$(DESTDIR)$(perllibdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(perllibdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(perllibdir)" || exit $$?; \
 	done
 
 uninstall-nodist_perllibDATA:
diff --git a/lib/Makefile.in b/lib/Makefile.in
index cab22edb8..2ecc780f2 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -83,8 +83,6 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(pkgvdatadir)" "$(DESTDIR)$(scriptdir)"
-dist_pkgvdataDATA_INSTALL = $(INSTALL_DATA)
-dist_scriptDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgvdata_DATA) $(dist_script_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -254,8 +252,8 @@ install-dist_pkgvdataDATA: $(dist_pkgvdata_DATA)
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(dist_pkgvdataDATA_INSTALL) $$files '$(DESTDIR)$(pkgvdatadir)'"; \
-	  $(dist_pkgvdataDATA_INSTALL) $$files "$(DESTDIR)$(pkgvdatadir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgvdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgvdatadir)" || exit $$?; \
 	done
 
 uninstall-dist_pkgvdataDATA:
@@ -273,8 +271,8 @@ install-dist_scriptDATA: $(dist_script_DATA)
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(dist_scriptDATA_INSTALL) $$files '$(DESTDIR)$(scriptdir)'"; \
-	  $(dist_scriptDATA_INSTALL) $$files "$(DESTDIR)$(scriptdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(scriptdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(scriptdir)" || exit $$?; \
 	done
 
 uninstall-dist_scriptDATA:
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 1717f2740..34540157d 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -73,7 +73,6 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(amdir)"
-dist_amDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_am_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -245,8 +244,8 @@ install-dist_amDATA: $(dist_am_DATA)
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(dist_amDATA_INSTALL) $$files '$(DESTDIR)$(amdir)'"; \
-	  $(dist_amDATA_INSTALL) $$files "$(DESTDIR)$(amdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(amdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(amdir)" || exit $$?; \
 	done
 
 uninstall-dist_amDATA:
diff --git a/lib/am/data.am b/lib/am/data.am
index 63db01d65..62383fa9f 100644
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -25,7 +25,6 @@ endif %?INSTALL%
 
 if %?INSTALL%
 am__installdirs += "$(DESTDIR)$(%NDIR%dir)"
-%DIR%%PRIMARY%_INSTALL = $(INSTALL_%ONE_PRIMARY%)
 .PHONY install-%EXEC?exec:data%-am: install-%DIR%%PRIMARY%
 install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%)
 	@$(NORMAL_INSTALL)
@@ -42,8 +41,8 @@ if %?BASE%
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(%DIR%%PRIMARY%_INSTALL) $$files '$(DESTDIR)$(%NDIR%dir)'"; \
-	  $(%DIR%%PRIMARY%_INSTALL) $$files "$(DESTDIR)$(%NDIR%dir)" || exit $$?; \
+	  echo " $(INSTALL_%ONE_PRIMARY%) $$files '$(DESTDIR)$(%NDIR%dir)'"; \
+	  $(INSTALL_%ONE_PRIMARY%) $$files "$(DESTDIR)$(%NDIR%dir)" || exit $$?; \
 	done
 else !%?BASE%
 	@list='$(%DIR%_%PRIMARY%)'; $(am__nobase_list) | \
@@ -55,8 +54,8 @@ else !%?BASE%
 	    test "x$$dir" = x. || { \
 	      echo "$(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
 	      $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)/$$dir"; }; \
-	    echo " $(%DIR%%PRIMARY%_INSTALL) $$xfiles '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
-	    $(%DIR%%PRIMARY%_INSTALL) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit $$?; }; \
+	    echo " $(INSTALL_%ONE_PRIMARY%) $$xfiles '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
+	    $(INSTALL_%ONE_PRIMARY%) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit $$?; }; \
 	done
 endif !%?BASE%
 endif %?INSTALL%
diff --git a/lib/am/libs.am b/lib/am/libs.am
index 006400940..ee0061eb0 100644
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -25,7 +25,6 @@ endif %?INSTALL%
 
 if %?INSTALL%
 am__installdirs += "$(DESTDIR)$(%NDIR%dir)"
-%DIR%LIBRARIES_INSTALL = $(INSTALL_DATA)
 .PHONY install-%EXEC?exec:data%-am: install-%DIR%LIBRARIES
 install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -39,8 +38,8 @@ if %?BASE%
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
-	  echo " $(%DIR%LIBRARIES_INSTALL) $$list2 '$(DESTDIR)$(%NDIR%dir)'"; \
-	  $(%DIR%LIBRARIES_INSTALL) $$list2 "$(DESTDIR)$(%NDIR%dir)" || exit $$?; }
+	  echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(%NDIR%dir)'"; \
+	  $(INSTALL_DATA) $$list2 "$(DESTDIR)$(%NDIR%dir)" || exit $$?; }
 else !%?BASE%
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
@@ -52,8 +51,8 @@ else !%?BASE%
 	    test "x$$dir" = x. || { \
 	      echo "$(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
 	      $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)/$$dir"; }; \
-	    echo " $(%DIR%%PRIMARY%_INSTALL) $$xfiles '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
-	    $(%DIR%%PRIMARY%_INSTALL) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit $$?; }; \
+	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
+	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit $$?; }; \
 	done
 endif !%?BASE%
 ## We do two loops here so that $(POST_INSTALL) can be empty.  If we
diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index c6d731de3..08e055dc8 100644
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -25,7 +25,6 @@ endif %?INSTALL%
 
 if %?INSTALL%
 am__installdirs += "$(DESTDIR)$(%NDIR%dir)"
-%DIR%LTLIBRARIES_INSTALL = $(INSTALL)
 .PHONY install-%EXEC?exec:data%-am: install-%DIR%LTLIBRARIES
 install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -43,10 +42,10 @@ if %?BASE%
 ## if the program doesn't have a name that libtool expects.
 ## Use INSTALL and not INSTALL_DATA because libtool knows the right
 ## permissions to use.
-?LIBTOOL?	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(%NDIR%dir)'"; \
-?LIBTOOL?	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(%NDIR%dir)"; \
-?!LIBTOOL?	  echo " $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$list '$(DESTDIR)$(%NDIR%dir)'"; \
-?!LIBTOOL?	  $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$list "$(DESTDIR)$(%NDIR%dir)"; \
+?LIBTOOL?	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(%NDIR%dir)'"; \
+?LIBTOOL?	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(%NDIR%dir)"; \
+?!LIBTOOL?	  echo " $(INSTALL) $(INSTALL_STRIP_FLAG) $$list '$(DESTDIR)$(%NDIR%dir)'"; \
+?!LIBTOOL?	  $(INSTALL) $(INSTALL_STRIP_FLAG) $$list "$(DESTDIR)$(%NDIR%dir)"; \
 	}
 else !%?BASE%
 	@list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
@@ -65,10 +64,10 @@ else !%?BASE%
 ## if the program doesn't have a name that libtool expects.
 ## Use INSTALL and not INSTALL_DATA because libtool knows the right
 ## permissions to use.
-?LIBTOOL?	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$files '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
-?LIBTOOL?	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$files "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit $$?; \
-?!LIBTOOL?	    echo " $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$files '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
-?!LIBTOOL?	    $(%DIR%LTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$files "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit $$?; \
+?LIBTOOL?	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$files '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
+?LIBTOOL?	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$files "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit $$?; \
+?!LIBTOOL?	    echo " $(INSTALL) $(INSTALL_STRIP_FLAG) $$files '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
+?!LIBTOOL?	    $(INSTALL) $(INSTALL_STRIP_FLAG) $$files "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit $$?; \
 	  }; \
 	done
 endif !%?BASE%
diff --git a/lib/am/progs.am b/lib/am/progs.am
index 4ed702b53..114407f48 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -21,7 +21,6 @@
 
 if %?INSTALL%
 am__installdirs += "$(DESTDIR)$(%NDIR%dir)"
-%DIR%PROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 .PHONY install-%EXEC?exec:data%-am: install-%DIR%PROGRAMS
 install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -57,13 +56,13 @@ install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
 ?!BASE?	  f) \
 	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	    test -z "$$files" || { \
-?!LIBTOOL?	      echo " $(INSTALL_PROGRAM_ENV) $(%DIR%PROGRAMS_INSTALL) $$files '$(DESTDIR)$(%NDIR%dir)$$dir'"; \
-?!LIBTOOL?	      $(INSTALL_PROGRAM_ENV) $(%DIR%PROGRAMS_INSTALL) $$files "$(DESTDIR)$(%NDIR%dir)$$dir" || exit $$?; \
+?!LIBTOOL?	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(%NDIR%dir)$$dir'"; \
+?!LIBTOOL?	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(%NDIR%dir)$$dir" || exit $$?; \
 ## Note that we explicitly set the libtool mode.  This avoids any
 ## lossage if the install program doesn't have a name that libtool
 ## expects.
-?LIBTOOL?	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(%DIR%PROGRAMS_INSTALL) $$files '$(DESTDIR)$(%NDIR%dir)$$dir'"; \
-?LIBTOOL?	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(%DIR%PROGRAMS_INSTALL) $$files "$(DESTDIR)$(%NDIR%dir)$$dir" || exit $$?; \
+?LIBTOOL?	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(%NDIR%dir)$$dir'"; \
+?LIBTOOL?	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(%NDIR%dir)$$dir" || exit $$?; \
 	    } \
 ?!BASE?	  ;; esac \
 	; done
diff --git a/lib/am/python.am b/lib/am/python.am
index 5d234867d..704745230 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -25,7 +25,6 @@ endif %?INSTALL%
 
 if %?INSTALL%
 am__installdirs += "$(DESTDIR)$(%NDIR%dir)"
-%DIR%PYTHON_INSTALL = $(INSTALL_DATA)
 .PHONY install-%EXEC?exec:data%-am: install-%DIR%PYTHON
 install-%DIR%PYTHON: $(%DIR%_PYTHON)
 	@$(NORMAL_INSTALL)
@@ -46,8 +45,8 @@ if %?BASE%
 	for file in $$list2; do echo $$file; done | $(am__base_list) | \
 	while read files; do \
 ## Don't perform translation, since script name is important.
-	  echo " $(%DIR%PYTHON_INSTALL) $$files '$(DESTDIR)$(%NDIR%dir)'"; \
-	  $(%DIR%PYTHON_INSTALL) $$files "$(DESTDIR)$(%NDIR%dir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(%NDIR%dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(%NDIR%dir)" || exit $$?; \
 	done || exit $$?; \
 ## Byte-compile must be done at install time, since file times are
 ## encoded in the actual files.
@@ -71,8 +70,8 @@ else !%?BASE%
 	      echo "$(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
 	      $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)/$$dir"; }; \
 ## Don't perform translation, since script name is important.
-	    echo " $(%DIR%PYTHON_INSTALL) $$xfiles '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
-	    $(%DIR%PYTHON_INSTALL) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit $$?; }; \
+	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
+	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit $$?; }; \
 ## Byte-compile must be done at install time, since file times are
 ## encoded in the actual files.
 	  if test -n "$$dlist"; then \
diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index e4b61d176..b8e61c961 100644
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -26,7 +26,6 @@ endif %?INSTALL%
 if %?INSTALL%
 ## if doesn't work properly for Automake variables yet.
 am__installdirs += "$(DESTDIR)$(%NDIR%dir)"
-%DIR%SCRIPT_INSTALL = $(INSTALL_SCRIPT)
 .PHONY install-%EXEC?exec:data%-am: install-%DIR%SCRIPTS
 install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
 	@$(NORMAL_INSTALL)
@@ -62,8 +61,8 @@ install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS)
 ?!BASE?	  f) \
 	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	     test -z "$$files" || { \
-	       echo " $(%DIR%SCRIPT_INSTALL) $$files '$(DESTDIR)$(%NDIR%dir)$$dir'"; \
-	       $(%DIR%SCRIPT_INSTALL) $$files "$(DESTDIR)$(%NDIR%dir)$$dir" || exit $$?; \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(%NDIR%dir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(%NDIR%dir)$$dir" || exit $$?; \
 	     } \
 ?!BASE?	  ;; esac \
 	; done
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 6aff285aa..b2aaa6cf5 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -73,7 +73,6 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(m4datadir)"
-dist_m4dataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_m4data_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -242,8 +241,8 @@ install-dist_m4dataDATA: $(dist_m4data_DATA)
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(dist_m4dataDATA_INSTALL) $$files '$(DESTDIR)$(m4datadir)'"; \
-	  $(dist_m4dataDATA_INSTALL) $$files "$(DESTDIR)$(m4datadir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(m4datadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(m4datadir)" || exit $$?; \
 	done
 
 uninstall-dist_m4dataDATA: