Patch: FYI: PR 203

[Tom Tromey]

I'm checking this in.
This adds a test case and a fix for PR 203.

In retrospect doing something more generic may not be necessary.  It
probably doesn't make sense to have -local versions of some required
targets.  I'm ok with handling them case-by-case for now.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        * 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.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1247
diff -u -r1.1247 automake.in
--- automake.in 2001/12/30 20:54:21 1.1247
+++ automake.in 2001/12/30 23:44:37
@@ -3990,7 +3990,10 @@
     $output_rules .=
       &file_contents ('install',
                      ('_am_installdirs'
-                      => variable_value ('_am_installdirs') || ''));
+                      => variable_value ('_am_installdirs') || '',
+                      'installdirs-local'
+                      => (target_defined ('installdirs-local')
+                          ? ' installdirs-local' : '')));
 }
 
 
Index: automake.texi
===================================================================
RCS file: /cvs/automake/automake/automake.texi,v
retrieving revision 1.252
diff -u -r1.252 automake.texi
--- automake.texi 2001/12/30 21:01:03 1.252
+++ automake.texi 2001/12/30 23:44:42
@@ -4366,8 +4366,8 @@
 
 The targets that support a local version are @code{all}, @code{info},
 @code{dvi}, @code{check}, @code{install-data}, @code{install-exec},
address@hidden, and the various @code{clean} targets
-(@code{mostlyclean}, @code{clean}, @code{distclean}, and
address@hidden, @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
Index: stamp-vti
===================================================================
RCS file: /cvs/automake/automake/stamp-vti,v
retrieving revision 1.150
diff -u -r1.150 stamp-vti
--- stamp-vti 2001/12/27 06:11:08 1.150
+++ stamp-vti 2001/12/30 23:44:42
@@ -1,4 +1,4 @@
address@hidden UPDATED 6 December 2001
address@hidden UPDATED 30 December 2001
 @set UPDATED-MONTH December 2001
 @set EDITION 1.5c
 @set VERSION 1.5c
Index: version.texi
===================================================================
RCS file: /cvs/automake/automake/version.texi,v
retrieving revision 1.223
diff -u -r1.223 version.texi
--- version.texi 2001/12/27 06:11:09 1.223
+++ version.texi 2001/12/30 23:44:42
@@ -1,4 +1,4 @@
address@hidden UPDATED 6 December 2001
address@hidden UPDATED 30 December 2001
 @set UPDATED-MONTH December 2001
 @set EDITION 1.5c
 @set VERSION 1.5c
Index: lib/am/install.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/install.am,v
retrieving revision 1.7
diff -u -r1.7 install.am
--- lib/am/install.am 2001/05/18 01:14:53 1.7
+++ lib/am/install.am 2001/12/30 23:44:42
@@ -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%
 
 
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.361
diff -u -r1.361 Makefile.am
--- tests/Makefile.am 2001/12/30 20:29:14 1.361
+++ tests/Makefile.am 2001/12/30 23:44:42
@@ -158,6 +158,7 @@
 insh.test \
 insh2.test \
 install2.test \
+installdir.test \
 installsh.test \
 instdata.test \
 instdata2.test \
Index: tests/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.in,v
retrieving revision 1.468
diff -u -r1.468 Makefile.in
--- tests/Makefile.in 2001/12/30 20:29:14 1.468
+++ tests/Makefile.in 2001/12/30 23:44:42
@@ -231,6 +231,7 @@
 insh.test \
 insh2.test \
 install2.test \
+installdir.test \
 installsh.test \
 instdata.test \
 instdata2.test \
Index: tests/installdir.test
===================================================================
RCS file: installdir.test
diff -N installdir.test
--- /dev/null   Tue May  5 13:32:27 1998
+++ tests/installdir.test Sun Dec 30 15:44:42 2001
@@ -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