From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 20 Dec 2004 13:10:25 +0000 (+0000)
Subject: * libtoolize.in: Install `install-sh' as well, needed for configure ..
X-Git-Tag: release-1-5-12~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d9f806007833003e059eeb3cf169085d2f8ba94;p=thirdparty%2Flibtool.git

* libtoolize.in: Install `install-sh' as well, needed for configure ..
* Makefile.am: .. 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 54329dea2..218fb1a20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-12-20  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 	
+	* libtoolize.in: Install `install-sh' as well, needed for configure ..
+	* Makefile.am: .. install, update it.
+	* NEWS, doc/libtool.texi (Distributing): .. document it.
+	Reported by Ross Boylan <ross@biostat.ucsf.edu>.
+
 	* libtool.m4 [solaris] (AC_LIBTOOL_PROG_LD_SHLIBS): Use ${wl} for
 	whole_archive_flag_spec.  Missing backport reported by Ralf Menzel
 	<menzel@ls6.cs.uni-dortmund.de>.
diff --git a/Makefile.am b/Makefile.am
index 467e7ef40..7461fd5fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ CLEANFILES = libtool libtoolize ltmain.shT
 # These are required by libtoolize and must be executable when installed.
 # Since _SCRIPTS gets the program transform applied we make them
 # executable by hand
-pkgdata_DATA = config.guess config.sub ltmain.sh
+pkgdata_DATA = config.guess config.sub install-sh ltmain.sh
 
 # This macro file should be visible to Automake's aclocal.
 aclocal_DATA = $(aclocal_macros)
@@ -75,6 +75,7 @@ install-data-hook:
 	cd libltdl && $(MAKE) local-install-files
 	chmod +x $(DESTDIR)$(pkgdatadir)/config.guess
 	chmod +x $(DESTDIR)$(pkgdatadir)/config.sub
+	chmod +x $(DESTDIR)$(pkgdatadir)/install-sh
 
 # Uninstall libltdl
 uninstall-local:
@@ -155,6 +156,8 @@ FETCHFILES = \
 libltdl/config.guess \
 ./config.sub \
 libltdl/config.sub \
+./install-sh \
+libltdl/install-sh \
 doc/texinfo.tex
 
 ## Fetch the latest versions of files we care about.
@@ -165,6 +168,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 fb72a94a3..3038b932c 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ NEWS - list of user-visible changes between releases of GNU Libtool
 
 New in 1.5.11a: 2004-??-??; CVS version 1.5.11a, Libtool team:
 * Support for Portland Group compiler on Linux.
+* libtoolize now also installs `install-sh'.
 * Bug Fixes.
 
 New in 1.5.10: 2004-09-19; CVS version 1.5.9a, Libtool team:
diff --git a/doc/libtool.texi b/doc/libtool.texi
index 77a21e80e..bf73d6e8c 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -1839,6 +1839,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.in b/libtoolize.in
index 65f987fdb..64f7a60f6 100644
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -158,7 +158,7 @@ if test -z "$files"; then
   echo "$progname: cannot list files in \`$pkgdatadir'" 1>&2
   exit 1
 fi
-files='config.guess config.sub ltmain.sh'
+files='config.guess config.sub install-sh ltmain.sh'
 
 auxdir=.
 auxdirline=`grep '^AC_CONFIG_AUX_DIR' $configure_ac 2>/dev/null`