From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 20 Dec 2004 13:09:07 +0000 (+0000)
Subject: * libtoolize.m4sh: Install `install-sh' as well, needed for configure ..
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14e2ffc4db97078570c941709b2fdeb74304015b;p=thirdparty%2Flibtool.git

* 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 a80f6d1bd..6b64d2478 100644
--- 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 131715d00..80308c627 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,7 +56,8 @@ CLEANFILES = libtool libtoolize \
 # 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_pkgdata_DATA = config/config.guess config/config.sub config/ltmain.sh
+dist_pkgdata_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.
@@ -188,6 +189,7 @@ install-data-local:
 install-data-hook:
 	chmod +x $(DESTDIR)$(pkgdatadir)/config.guess
 	chmod +x $(DESTDIR)$(pkgdatadir)/config.sub
+	chmod +x $(DESTDIR)$(pkgdatadir)/install-sh
 
 ## Ship README.alpha only in alpha release, but renamed to README
 dist-hook:
diff --git a/Makefile.maint b/Makefile.maint
index b07f07b14..cce14875c 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -121,6 +121,7 @@ FETCHFILES = \
 ./INSTALL \
 config/config.guess \
 config/config.sub \
+config/install-sh \
 config/texinfo.tex
 
 ## Fetch the latest versions of files we care about.
@@ -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 62de04cab..38ac40308 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ New in 1.9h: 2004-??-??; CVS version 1.9g, Libtool team:
 * Support for Portland Group compiler on Linux.
 * Fix libltdl on static platforms.
 * Support for linux-dietlibc (`diet' as well as `diet-dyn', separately).
+* `libtoolize --install' now also installs `install-sh'.
 
 New in 1.9f: 2004-10-23; CVS version 1.9e, Libtool team:
 * Calculate dllsearchpath correctly for wrapper scripts on cygwin.
diff --git a/doc/libtool.texi b/doc/libtool.texi
index 0f2aaf7f3..f0f905f82 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -2122,6 +2122,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 b02ae7595..9471e8696 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -589,7 +589,7 @@ func_config_update ()
   #       specially below though, so don't add them here):
   pkgmacro_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
@@ -613,6 +613,8 @@ func_config_update ()
     func_config_update "$pkgdatadir/config.guess" "$auxdir/config.guess"
     test -f "$pkgdatadir/config.sub" \
       && func_config_update "$pkgdatadir/config.sub" "$auxdir/config.sub"
+    test -f "$pkgdatadir/install-sh" \
+      && func_config_update "$pkgdatadir/install-sh" "$auxdir/install-sh"
   fi
   func_ltmain_update "$pkgdatadir/ltmain.sh" "$auxdir/ltmain.sh"