From 5da0a00af4361547875293ad046e5cd0b616ebcf Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Mon, 26 Feb 2001 09:14:42 +0000
Subject: [PATCH] * automake.in (@installdirs): Remove. (&file_contents): Be
 able to grow Automake macros with `+='. (&handle_texinfo, &handle_man_pages,
 &am_install_var): Let your files define _am_installdirs.
 (&handle_installdirs): Remove the code, just output `install.am'. *
 install.am: New. * data.am, header.am, libs.am, lisp.am, ltlib.am, mans.am,
 progs.am, * python.am, scripts.am, texinfos.am: Extend $(_am_installdirs).

---
 ChangeLog          | 11 +++++++++++
 Makefile.in        | 11 ++---------
 automake.in        | 47 +++++++++++++++++-----------------------------
 data.am            |  1 +
 header.am          |  1 +
 install.am         | 26 +++++++++++++++++++++++++
 lib/am/data.am     |  1 +
 lib/am/header.am   |  1 +
 lib/am/install.am  | 26 +++++++++++++++++++++++++
 lib/am/libs.am     |  3 ++-
 lib/am/lisp.am     |  1 +
 lib/am/ltlib.am    |  1 +
 lib/am/mans.am     |  1 +
 lib/am/progs.am    |  1 +
 lib/am/python.am   |  3 ++-
 lib/am/scripts.am  |  3 ++-
 lib/am/texinfos.am |  1 +
 libs.am            |  3 ++-
 lisp.am            |  1 +
 ltlib.am           |  1 +
 m4/Makefile.in     |  6 ++----
 mans.am            |  1 +
 progs.am           |  1 +
 python.am          |  3 ++-
 scripts.am         |  3 ++-
 tests/Makefile.in  | 33 ++++++++++++++++----------------
 texinfos.am        |  1 +
 27 files changed, 126 insertions(+), 66 deletions(-)
 create mode 100644 install.am
 create mode 100644 lib/am/install.am

diff --git a/ChangeLog b/ChangeLog
index 963737d4..7bb71984 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-02-26  Akim Demaille  <akim@epita.fr>
+
+	* automake.in (@installdirs): Remove.
+	(&file_contents): Be able to grow Automake macros with `+='.
+	(&handle_texinfo, &handle_man_pages, &am_install_var): Let your
+	files define _am_installdirs.
+	(&handle_installdirs): Remove the code, just output `install.am'.
+	* install.am: New.
+	* data.am, header.am, libs.am, lisp.am, ltlib.am, mans.am, progs.am,
+	* python.am, scripts.am, texinfos.am: Extend $(_am_installdirs).
+
 2001-02-26  Akim Demaille  <akim@epita.fr>
 
 	* tests/instdata2.test (libexec_DATA): Exercise more
diff --git a/Makefile.in b/Makefile.in
index 13359ea7..9122b3de 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,7 +47,6 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
 
@@ -159,7 +158,6 @@ automake: $(top_builddir)/config.status automake.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 aclocal: $(top_builddir)/config.status aclocal.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
-
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -223,7 +221,6 @@ automake.dvi: automake.texi $(srcdir)/version.texi
 DVIPS = dvips
 .dvi.ps:
 	$(DVIPS) $< -o $@
-
 ?EXEC?insexec-data-am: install-info-am
 ?!EXEC?install-data-am: install-info-am
 install-info-am: $(INFO_DEPS)
@@ -291,7 +288,6 @@ maintainer-clean-aminfo:
 	    rm -f $$i-[0-9]*; \
 	  fi; \
 	done
-
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
@@ -309,7 +305,6 @@ uninstall-dist_pkgdataDATA:
 	  echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
 	  rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
 	done
-
 install-dist_scriptDATA: $(dist_script_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(scriptdir)
@@ -517,12 +512,10 @@ all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA)
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
+
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) \
-		$(DESTDIR)$(dist_pkgdatadir) \
-		$(DESTDIR)$(dist_scriptdir)
-
+	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(scriptdir)
 
 mostlyclean-generic:
 
diff --git a/automake.in b/automake.in
index 84fe295d..9973107f 100755
--- a/automake.in
+++ b/automake.in
@@ -2465,7 +2465,6 @@ sub handle_texinfo
 
     if (! defined $options{'no-installinfo'})
     {
-	push (@installdirs, '$(DESTDIR)$(infodir)');
 	# Make sure documentation is made and installed first.  Use
 	# $(INFO_DEPS), not 'info', because otherwise recursive makes
 	# get run twice during "make all".
@@ -2538,8 +2537,6 @@ sub handle_man_pages
     foreach my $sect (sort keys %sections)
     {
 	&define_variable ('man' . $sect . 'dir', '$(mandir)/man' . $sect);
-	push (@installdirs, '$(DESTDIR)$(mandir)/man' . $sect)
-	    unless defined $options{'no-installman'};
 	$output_rules .= &file_contents ('mans',
 					 &transform ('SECTION', $sect));
     }
@@ -3561,26 +3558,9 @@ sub handle_footer
 # Deal with installdirs target.
 sub handle_installdirs
 {
-    # GNU Makefile standards recommend this.
-    if (&variable_defined ('SUBDIRS'))
-    {
-	# We create a separate `-am' target so that the -recursive
-	# rule will work correctly.
-	$output_rules .= ("installdirs: installdirs-recursive\n"
-			  . "installdirs-am:\n");
-	&depend ('.PHONY', 'installdirs-am');
-    }
-    else
-    {
-	$output_rules .= "installdirs:\n";
-    }
-    &depend ('.PHONY', 'installdirs');
-    if (@installdirs)
-    {
-	&pretty_print_rule ("\t" . '$(mkinstalldirs) ', "\t\t",
-			    @installdirs);
-    }
-    $output_rules .= "\n";
+    $output_rules .= &file_contents
+      ('install',
+       transform ('_am_installdirs' => $am_var_defs{'_am_installdirs'}));
 }
 
 # There are several targets which need to be merged.  This is because
@@ -6564,8 +6544,6 @@ sub initialize_per_input
     %dist_dirs = ();
 
     # List of dependencies for the obvious targets.
-    @installdirs = ();
-
     @info = ();
     @dvi = ();
     @all = ();
@@ -6882,12 +6860,21 @@ sub file_contents
  	}
  	elsif (/$MACRO_PATTERN/mso)
  	{
- 	    $result_vars .= "$separator$comment$_\n"
-	      unless defined $contents{$1};
- 	    $comment = $separator = '';
- 	    &prog_error ("$file:$.: macro \`$1' with trailing backslash")
+	    my ($var, $type, $val) = ($1, $2, $3);
+ 	    &prog_error ("$file:$.: macro \`$var' with trailing backslash")
 	      if /\\$/;;
- 	    $am_var_defs{$1} = $3;
+	    # Accumulating variables must not be output.
+	    if ($type eq '+')
+	      {
+		$am_var_defs{$var} .= ($am_var_defs{$var} && ' ') . $val;
+	      }
+	    else
+	      {
+		$am_var_defs{$var} = $val;
+		$result_vars .= "$separator$comment$_\n"
+		  unless defined $contents{$var};
+	      }
+ 	    $comment = $separator = '';
  	}
  	else
  	{
diff --git a/data.am b/data.am
index e7bcba64..2b11f09b 100644
--- a/data.am
+++ b/data.am
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 ?EXEC?.PHONY install-exec-am: install-@DIR@DATA
 ?!EXEC?.PHONY install-data-am: install-@DIR@DATA
 install-@DIR@DATA: $(@DIR@_DATA)
diff --git a/header.am b/header.am
index d8ddf1d8..4f1766c2 100644
--- a/header.am
+++ b/header.am
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 ?EXEC?.PHONY install-exec-am: install-@DIR@HEADERS
 ?!EXEC?.PHONY install-data-am: install-@DIR@HEADERS
 install-@DIR@HEADERS: $(@DIR@_HEADERS)
diff --git a/install.am b/install.am
new file mode 100644
index 00000000..4de87436
--- /dev/null
+++ b/install.am
@@ -0,0 +1,26 @@
+## automake - create Makefile.in from Makefile.am
+## Copyright 2001 Free Software Foundation, Inc.
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+## 02111-1307, USA.
+
+?SUBDIRS?.PHONY: installdirs installdirs-am installdirs-recursive
+?SUBDIRS?installdirs: installdirs-recursive
+?SUBDIRS?installdirs-am:
+?SUBDIRS??_am_installdirs?	$(mkinstalldirs) @_am_installdirs@
+
+?!SUBDIRS?.PHONY: installdirs
+?!SUBDIRS?installdirs:
+?!SUBDIRS??_am_installdirs?	$(mkinstalldirs) @_am_installdirs@
diff --git a/lib/am/data.am b/lib/am/data.am
index e7bcba64..2b11f09b 100644
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 ?EXEC?.PHONY install-exec-am: install-@DIR@DATA
 ?!EXEC?.PHONY install-data-am: install-@DIR@DATA
 install-@DIR@DATA: $(@DIR@_DATA)
diff --git a/lib/am/header.am b/lib/am/header.am
index d8ddf1d8..4f1766c2 100644
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 ?EXEC?.PHONY install-exec-am: install-@DIR@HEADERS
 ?!EXEC?.PHONY install-data-am: install-@DIR@HEADERS
 install-@DIR@HEADERS: $(@DIR@_HEADERS)
diff --git a/lib/am/install.am b/lib/am/install.am
new file mode 100644
index 00000000..4de87436
--- /dev/null
+++ b/lib/am/install.am
@@ -0,0 +1,26 @@
+## automake - create Makefile.in from Makefile.am
+## Copyright 2001 Free Software Foundation, Inc.
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+## 02111-1307, USA.
+
+?SUBDIRS?.PHONY: installdirs installdirs-am installdirs-recursive
+?SUBDIRS?installdirs: installdirs-recursive
+?SUBDIRS?installdirs-am:
+?SUBDIRS??_am_installdirs?	$(mkinstalldirs) @_am_installdirs@
+
+?!SUBDIRS?.PHONY: installdirs
+?!SUBDIRS?installdirs:
+?!SUBDIRS??_am_installdirs?	$(mkinstalldirs) @_am_installdirs@
diff --git a/lib/am/libs.am b/lib/am/libs.am
index b5b935fe..5de5cf54 100644
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 .PHONY install-exec-am: install-@DIR@LIBRARIES
 install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES)
 	@$(NORMAL_INSTALL)
diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 0c020a03..dbc2257c 100644
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 ?EXEC?.PHONY install-exec-am: install-@DIR@LISP
 ?!EXEC?.PHONY install-data-am: install-@DIR@LISP
 install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES)
diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index cb10a2bc..2961f0b4 100644
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -17,6 +17,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 .PHONY install-exec-am: install-@DIR@LTLIBRARIES
 install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
diff --git a/lib/am/mans.am b/lib/am/mans.am
index 7c57d0cf..e67e03c5 100644
--- a/lib/am/mans.am
+++ b/lib/am/mans.am
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+?INSTALL_MAN?_am_installdirs += $(DESTDIR)$(man@SECTION@dir)
 .PHONY install-man: install-man@SECTION@
 install-man@SECTION@: $(man@SECTION@_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
diff --git a/lib/am/progs.am b/lib/am/progs.am
index 231a4da0..d7853a85 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 .PHONY install-exec-am: install-@DIR@PROGRAMS
 install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
 	@$(NORMAL_INSTALL)
diff --git a/lib/am/python.am b/lib/am/python.am
index 089282f7..78365df0 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1999 Free Software Foundation, Inc.
+## Copyright 1999, 2001 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@DIR@dir)
 .PHONY install-exec-am: install-@DIR@PYTHON
 install-@DIR@PYTHON: $(@DIR@_PYTHON)
 	@$(NORMAL_INSTALL)
diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index e559ada8..a746ce83 100644
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 .PHONY install-exec-am: install-@DIR@SCRIPTS
 install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS)
 	@$(NORMAL_INSTALL)
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 280d9bdf..7dea0c37 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -27,6 +27,7 @@ DVIPS = dvips
 ## break a possible install-sh reference.
 ## Funny name due to --cygnus influence; we want to reserve
 ## `install-info' for the user.
+?INSTALL-INFO?_am_installdirs += $(DESTDIR)$(infodir)
 .PHONY: install-info-am
 ?EXEC??INSTALL-INFO?insexec-data-am: install-info-am
 ?!EXEC??INSTALL-INFO?install-data-am: install-info-am
diff --git a/libs.am b/libs.am
index b5b935fe..5de5cf54 100644
--- a/libs.am
+++ b/libs.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 .PHONY install-exec-am: install-@DIR@LIBRARIES
 install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES)
 	@$(NORMAL_INSTALL)
diff --git a/lisp.am b/lisp.am
index 0c020a03..dbc2257c 100644
--- a/lisp.am
+++ b/lisp.am
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 ?EXEC?.PHONY install-exec-am: install-@DIR@LISP
 ?!EXEC?.PHONY install-data-am: install-@DIR@LISP
 install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES)
diff --git a/ltlib.am b/ltlib.am
index cb10a2bc..2961f0b4 100644
--- a/ltlib.am
+++ b/ltlib.am
@@ -17,6 +17,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 .PHONY install-exec-am: install-@DIR@LTLIBRARIES
 install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
diff --git a/m4/Makefile.in b/m4/Makefile.in
index d58b2e24..e419c876 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -47,7 +47,6 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
 
@@ -106,7 +105,6 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 
-
 install-m4dataDATA: $(m4data_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
@@ -163,9 +161,9 @@ all-am: Makefile $(DATA)
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(m4datadir)
 
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
 
 mostlyclean-generic:
 
diff --git a/mans.am b/mans.am
index 7c57d0cf..e67e03c5 100644
--- a/mans.am
+++ b/mans.am
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+?INSTALL_MAN?_am_installdirs += $(DESTDIR)$(man@SECTION@dir)
 .PHONY install-man: install-man@SECTION@
 install-man@SECTION@: $(man@SECTION@_MANS) $(man_MANS)
 	@$(NORMAL_INSTALL)
diff --git a/progs.am b/progs.am
index 231a4da0..d7853a85 100644
--- a/progs.am
+++ b/progs.am
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 .PHONY install-exec-am: install-@DIR@PROGRAMS
 install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
 	@$(NORMAL_INSTALL)
diff --git a/python.am b/python.am
index 089282f7..78365df0 100644
--- a/python.am
+++ b/python.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1999 Free Software Foundation, Inc.
+## Copyright 1999, 2001 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@DIR@dir)
 .PHONY install-exec-am: install-@DIR@PYTHON
 install-@DIR@PYTHON: $(@DIR@_PYTHON)
 	@$(NORMAL_INSTALL)
diff --git a/scripts.am b/scripts.am
index e559ada8..a746ce83 100644
--- a/scripts.am
+++ b/scripts.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
+## Copyright 1994, 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
+_am_installdirs += $(DESTDIR)$(@NDIR@dir)
 .PHONY install-exec-am: install-@DIR@SCRIPTS
 install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS)
 	@$(NORMAL_INSTALL)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index fcba2c97..1e808b18 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -47,7 +47,6 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
 
@@ -467,8 +466,8 @@ all-am: Makefile
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-installdirs:
 
+installdirs:
 
 mostlyclean-generic:
 
@@ -482,34 +481,34 @@ maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-clean: clean-am
+maintainer-clean-am: distclean-am maintainer-clean-generic
 
-clean-am: clean-generic mostlyclean-am
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic uninstall uninstall-am
 
-distclean: distclean-am
+install-man:
 
-distclean-am: clean-am distclean-generic distclean-local
+distclean: distclean-am
 
-install-data-am:
+clean-am: clean-generic mostlyclean-am
 
 install-exec-am:
 
-install-man:
+install-data-am:
+
+distclean-am: clean-am distclean-generic distclean-local
 
 maintainer-clean: maintainer-clean-am
 
-maintainer-clean-am: distclean-am maintainer-clean-generic
+mostlyclean-am: mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic
-
-.PHONY: all all-am check check-TESTS check-am clean clean-generic \
-	distclean distclean-generic distdir dvi dvi-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic uninstall uninstall-am
+clean: clean-am
 
 
 distclean-local:
diff --git a/texinfos.am b/texinfos.am
index 280d9bdf..7dea0c37 100644
--- a/texinfos.am
+++ b/texinfos.am
@@ -27,6 +27,7 @@ DVIPS = dvips
 ## break a possible install-sh reference.
 ## Funny name due to --cygnus influence; we want to reserve
 ## `install-info' for the user.
+?INSTALL-INFO?_am_installdirs += $(DESTDIR)$(infodir)
 .PHONY: install-info-am
 ?EXEC??INSTALL-INFO?insexec-data-am: install-info-am
 ?!EXEC??INSTALL-INFO?install-data-am: install-info-am
-- 
2.43.5