* libtoolize.m4sh: 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 4f08aa96f6e0e89563bc9a351bbfe1aea111b88d..824b828e3bab41dda34cdb073e6c50ac1d5c7da5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-01-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * libtoolize.m4sh: 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.
+
        * config/ltmain.m4sh: New option `--verbose'/`-v' to enable
        override of `--silent'.  Verbose is the default behavior.
        * doc/libtool.texi (Invoking libtool): Document it.

diff --git a/doc/libtool.texi b/doc/libtool.texi
index 184dd1a0df1716daf68d38c860c09bd14101a299..4043650c96dcda0bbde6ee7d0271bd49308433de 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -2140,7 +2140,10 @@ Note that the libtool script itself should @emph{not} be included with
 your package.  @xref{Configuring}.
 
 You should use the @command{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.m4sh b/libtoolize.m4sh
index edd4820872cfdc0ff51db0a27a84e9453a289918..f9e93062f7ca25b18b0c658745128f0ca44ace21 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -627,8 +627,6 @@ 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"