From 87e61e0f6a0ef3ab7e8806778a3f020a085aefc2 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Sun, 30 Dec 2001 23:46:28 +0000
Subject: [PATCH] 	* lib/am/install.am (?SUBDIRS?installdirs-am): Handle 
 installdirs-local. 	(?!SUBDIRS?installdirs): Likewise. 	* automake.in
 (handle_installdirs): Handle installdirs-local. 	* automake.texi
 (Extending): Mention installdirs. 	* tests/Makefile.am (TESTS): Added
 installdir.test. 	* tests/installdir.test: New file.

---
 ChangeLog             | 10 ++++++++++
 automake.in           |  5 ++++-
 automake.texi         |  4 ++--
 lib/am/install.am     |  4 ++--
 stamp-vti             |  2 +-
 tests/Makefile.am     |  1 +
 tests/Makefile.in     |  1 +
 tests/installdir.test | 14 ++++++++++++++
 version.texi          |  2 +-
 9 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100755 tests/installdir.test

diff --git a/ChangeLog b/ChangeLog
index 60d122e7b..0ca6e0f30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-12-30  Tom Tromey  <tromey@redhat.com>
+
+	* lib/am/install.am (?SUBDIRS?installdirs-am): Handle
+	installdirs-local.
+	(?!SUBDIRS?installdirs): Likewise.
+	* automake.in (handle_installdirs): Handle installdirs-local.
+	* automake.texi (Extending): Mention installdirs.
+	* tests/Makefile.am (TESTS): Added installdir.test.
+	* tests/installdir.test: New file.
+
 2001-12-30  Akim Demaille  <akim@epita.fr>
 
 	* lib/am/yacc.am: Also rename the possible y.output file.
diff --git a/automake.in b/automake.in
index 3095b801a..152334db6 100755
--- a/automake.in
+++ b/automake.in
@@ -3990,7 +3990,10 @@ sub handle_installdirs ()
     $output_rules .=
       &file_contents ('install',
 		      ('_am_installdirs'
-		       => variable_value ('_am_installdirs') || ''));
+		       => variable_value ('_am_installdirs') || '',
+		       'installdirs-local'
+		       => (target_defined ('installdirs-local')
+			   ? ' installdirs-local' : '')));
 }
 
 
diff --git a/automake.texi b/automake.texi
index 835d4e431..400a93b4e 100644
--- a/automake.texi
+++ b/automake.texi
@@ -4366,8 +4366,8 @@ with these user-supplied targets.
 
 The targets that support a local version are @code{all}, @code{info},
 @code{dvi}, @code{check}, @code{install-data}, @code{install-exec},
-@code{uninstall}, and the various @code{clean} targets
-(@code{mostlyclean}, @code{clean}, @code{distclean}, and
+@code{uninstall}, @code{installdirs} and the various @code{clean}
+targets (@code{mostlyclean}, @code{clean}, @code{distclean}, and
 @code{maintainer-clean}).  Note that there are no
 @code{uninstall-exec-local} or @code{uninstall-data-local} targets; just
 use @code{uninstall-local}.  It doesn't make sense to uninstall just
diff --git a/lib/am/install.am b/lib/am/install.am
index 45c059bb6..ddeef9cf2 100644
--- a/lib/am/install.am
+++ b/lib/am/install.am
@@ -21,11 +21,11 @@
 ## -------------------------- ##
 ?SUBDIRS?.PHONY: installdirs installdirs-am installdirs-recursive
 ?SUBDIRS?installdirs: installdirs-recursive
-?SUBDIRS?installdirs-am:
+?SUBDIRS?installdirs-am:%installdirs-local%
 ?SUBDIRS??_am_installdirs?	$(mkinstalldirs) %_am_installdirs%
 
 ?!SUBDIRS?.PHONY: installdirs
-?!SUBDIRS?installdirs:
+?!SUBDIRS?installdirs:%installdirs-local%
 ?!SUBDIRS??_am_installdirs?	$(mkinstalldirs) %_am_installdirs%
 
 
diff --git a/stamp-vti b/stamp-vti
index 1bf0a8764..7306789a8 100644
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 6 December 2001
+@set UPDATED 30 December 2001
 @set UPDATED-MONTH December 2001
 @set EDITION 1.5c
 @set VERSION 1.5c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ee5041943..7104b0910 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -158,6 +158,7 @@ info.test \
 insh.test \
 insh2.test \
 install2.test \
+installdir.test \
 installsh.test \
 instdata.test \
 instdata2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5a359007b..58b0eb285 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -231,6 +231,7 @@ info.test \
 insh.test \
 insh2.test \
 install2.test \
+installdir.test \
 installsh.test \
 instdata.test \
 instdata2.test \
diff --git a/tests/installdir.test b/tests/installdir.test
new file mode 100755
index 000000000..cb813010d
--- /dev/null
+++ b/tests/installdir.test
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+# Test for PR 203.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+installdirs-local:
+	@echo here
+END
+
+$AUTOMAKE || exit 1
+
+test `grep installdirs-local Makefile.in | wc -l` -eq 2
diff --git a/version.texi b/version.texi
index 1bf0a8764..7306789a8 100644
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 6 December 2001
+@set UPDATED 30 December 2001
 @set UPDATED-MONTH December 2001
 @set EDITION 1.5c
 @set VERSION 1.5c
-- 
2.47.2