* libtoolize.m4sh: Install `install-sh' as well, needed for configure ..

* Makefile.am, Makefile.maint: .. install, update it.
* NEWS, doc/libtool.texi (Distributing): .. document it.
Reported by Ross Boylan <ross@biostat.ucsf.edu>.

diff --git a/ChangeLog b/ChangeLog
index a0fcc3cfd65ecbadafe51cf11872b42577f6d4cd..ebe1596571174521d77b42f5d3cb70c7dabedf88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-12-20  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+       * libtoolize.m4sh: Install `install-sh' as well, needed for configure ..
+       * Makefile.am, Makefile.maint: .. install, update it.
+       * NEWS, doc/libtool.texi (Distributing): .. document it.
+       Reported by Ross Boylan <ross@biostat.ucsf.edu>.
+
        * m4/libtool.m4 [solaris] (_LT_LINKER_SHLIBS): Add '${wl}-z ${wl}text'
        to archive_cmds and archive_expsyms_cmds.  I.e., do not allow nopic in
        shared libraries.

diff --git a/Makefile.am b/Makefile.am
index 60a2a6da38872d4735728f81931d944b2e129623..f18fefb7af9ac387dd5a7522d9e607ce96eba457 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,8 @@ $(top_srcdir)/tests/package.m4: $(top_srcdir)/configure.ac
 # 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-local:
 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

diff --git a/Makefile.maint b/Makefile.maint
index b07f07b141eb1c7c9508d6bd15b9f3d0929c7a73..f657de3ac689a5d82b03a19e65b72bccfe23b79a 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -119,6 +119,7 @@ WGETSGO = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~
 ## 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 @@ fetch:
 ## 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 )

diff --git a/NEWS b/NEWS
index 07fb236bc041e38cc133426bcc02af91e1784a24..788810e807211d7fdf9b5d80a102bbbf5d916889 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ New in 2.1b: 2005-??-??; CVS version 2.1a, Libtool team:
 * 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'.
 \f
 New in 1.9h: 2004-??-??; CVS version 1.9g, Libtool team:
 * Libtool versions can now be parallel installed, except that only one

diff --git a/doc/libtool.texi b/doc/libtool.texi
index d02ad9ba4e4c07705383f92467d027e8d6b7ed7a..eec395506cef524c1de725caa6156c01a31b1d30 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -2132,6 +2132,10 @@ Attempt to guess a canonical system name.
 @pindex config.sub
 Canonical system name validation subroutine script.
 
+@item install-sh
+@pindex install-sh
+BSD-compatible @command{install} replacement script.
+
 @item ltmain.sh
 @pindex ltmain.sh
 A generic script implementing basic libtool functionality.

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 8195ba95430f3c9ef025054f297cec4c3477bcf8..0316ea6f5c0a8bc93794fcd7ff25d06e2beedb09 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -680,7 +680,7 @@ func_config_update ()
   #       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 @@ func_config_update ()
       "$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"