From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 13 Jan 2005 17:23:39 +0000 (+0000)
Subject: * libtoolize.in: Back out copying `install-sh' by libtoolize.
X-Git-Tag: release-1-5-12~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=200665d2337a4b09cc02ae43d68ff0049c146203;p=thirdparty%2Flibtool.git

* libtoolize.in: Back out copying `install-sh' by libtoolize.
* doc/libtool.texi (Distributing): Mention that we distribute
`install-sh', but that non-Automake users will have to copy
it by themselves.
---

diff --git a/ChangeLog b/ChangeLog
index 27a29cd53..10a24a21c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-01-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* libtoolize.in: Back out copying `install-sh' by libtoolize.
+	* doc/libtool.texi (Distributing): Mention that we distribute
+	`install-sh', but that non-Automake users will have to copy
+	it by themselves.
+
 	* libtoolize.in: Add datarootdir.
 
 2005-01-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
diff --git a/doc/libtool.texi b/doc/libtool.texi
index bf73d6e8c..de3e4f6f1 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -1852,7 +1852,10 @@ Note that the libtool script itself should @emph{not} be included with
 your package.  @xref{Configuring}.
 
 You should use the @code{libtoolize} program, rather than manually
-copying these files into your package.
+copying these files into your package.  Note however, that @file{install-sh}
+is not copied by @code{libtoolize}; if you use Automake, it will take care
+of that, otherwise you may obtain a copy from the package data directory
+of the installed Libtool.  This may change in a future Libtool version.
 
 @menu
 * Invoking libtoolize::         @code{libtoolize} command line options.
diff --git a/libtoolize.in b/libtoolize.in
index 757b9ca1f..a8426d8f9 100644
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -159,7 +159,7 @@ if test -z "$files"; then
   echo "$progname: cannot list files in \`$pkgdatadir'" 1>&2
   exit 1
 fi
-files='config.guess config.sub install-sh ltmain.sh'
+files='config.guess config.sub ltmain.sh'
 
 auxdir=.
 auxdirline=`grep '^AC_CONFIG_AUX_DIR' $configure_ac 2>/dev/null`