also copy install-sh

[Ralf Wildenhues]

OK to apply to HEAD and branch-2-0?  Automake is the owner of
`install-sh', right?

I could backport to branch-1-5 as well, if desirable.

A documentation update concerning how to use Libtool without Automake
might eventually follow.

Regards,
Ralf

        * libtoolize.m4sh: Install `install-sh' as well ..
        * Makefile.am, Makefile.maint: .. install, update it.
        * NEWS, doc/libtool.texi (Distributing): .. document it.
        Reported by Ross Boylan <address@hidden>.

Index: doc/libtool.texi
===================================================================
RCS file: /cvsroot/libtool/libtool/doc/libtool.texi,v
retrieving revision 1.185
diff -u -r1.185 libtool.texi
--- doc/libtool.texi    23 Nov 2004 09:37:06 -0000      1.185
+++ doc/libtool.texi    19 Dec 2004 13:53:13 -0000
@@ -2132,6 +2133,10 @@
 @pindex config.sub
 Canonical system name validation subroutine script.
 
address@hidden install-sh
address@hidden install-sh
+BSD-compatible @command{install} replacement script.
+
 @item ltmain.sh
 @pindex ltmain.sh
 A generic script implementing basic libtool functionality.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.136
diff -u -r1.136 Makefile.am
--- Makefile.am 24 Nov 2004 14:55:54 -0000      1.136
+++ Makefile.am 19 Dec 2004 14:20:58 -0000
@@ -83,7 +83,8 @@
 # These are required by libtoolize and must be executable when installed.
 # Since _SCRIPTS gets the program transform applied we make them
 # executable by hand
-dist_pkgvdata_DATA = config/config.guess config/config.sub config/ltmain.sh
+dist_pkgvdata_DATA = config/config.guess config/config.sub config/ltmain.sh \
+       config/install-sh
 
 # Everything that gets picked up by aclocal is automatically distributed,
 # this is the list of macro files we install on the user's system.
@@ -224,6 +225,7 @@
 install-data-hook:
        chmod +x $(DESTDIR)$(pkgvdatadir)/config.guess
        chmod +x $(DESTDIR)$(pkgvdatadir)/config.sub
+       chmod +x $(DESTDIR)$(pkgvdatadir)/install-sh
 
 ## Make versioned links.  We only run the transform on the root name;
 ## then we make a versioned link with the transformed base name.  This
Index: Makefile.maint
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.maint,v
retrieving revision 1.9
diff -u -r1.9 Makefile.maint
--- Makefile.maint      29 Oct 2004 08:25:25 -0000      1.9
+++ Makefile.maint      19 Dec 2004 14:20:59 -0000
@@ -119,6 +119,7 @@
 ## FIXME should be a lot more here
 FETCHFILES = \
 ./INSTALL \
+config/install-sh \
 config/config.guess \
 config/config.sub \
 config/texinfo.tex
@@ -131,6 +132,7 @@
 ## If a get fails then that is a problem.
        (cd Fetchdir && \
        $(WGETSGO)/autoconf/autoconf/INSTALL; \
+       $(WGETSGO)/automake/automake/lib/install-sh; \
        $(WGETSGO)/config/config/config.guess; \
        $(WGETSGO)/config/config/config.sub; \
        $(WGETSGO)/texinfo/texinfo/doc/texinfo.tex )
Index: NEWS
===================================================================
RCS file: /cvsroot/libtool/libtool/NEWS,v
retrieving revision 1.175
diff -u -r1.175 NEWS
--- NEWS        29 Nov 2004 21:18:26 -0000      1.175
+++ NEWS        19 Dec 2004 14:21:00 -0000
@@ -6,6 +6,7 @@
 * Fix libltdl on static platforms.
 * Support for linux-dietlibc (`diet' as well as `diet-dyn', separately).
 * Shell optimizations which break use of the stdin file descriptor in libtool.
+* `libtoolize --install' now also installs `install-sh'.
 
 New in 1.9h: 2004-??-??; CVS version 1.9g, Libtool team:
 * Libtool versions can now be parallel installed, except that only one
Index: libtoolize.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/libtoolize.m4sh,v
retrieving revision 1.5
diff -u -r1.5 libtoolize.m4sh
--- libtoolize.m4sh     17 Dec 2004 13:03:11 -0000      1.5
+++ libtoolize.m4sh     19 Dec 2004 14:21:01 -0000
@@ -680,7 +680,7 @@
   #       specially below though, so don't add them here):
   pkgvmacro_files='argz.m4:ltoptions.m4:ltsugar.m4:ltversion.m4'
 
-  glob_exclude_pkgaux_files='config.guess|config.sub|ltmain.sh'
+  glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh'
 
   func_scan_files
   $opt_quiet || func_check_macros
@@ -705,6 +705,7 @@
       "$auxdir" "$glob_exclude_pkgaux_files"
     func_config_update config.guess "$pkgvdatadirs" "$auxdir"
     func_config_update config.sub   "$pkgvdatadirs" "$auxdir"
+    func_config_update install-sh   "$pkgvdatadirs" "$auxdir"
   fi
   func_ltmain_update ltmain.sh "$pkgvdatadirs" "$auxdir"