new files -- part of HP merge.

[deliverable/binutils-gdb.git] / ltmain.sh

diff --git a/ltmain.sh b/ltmain.sh
index 790616976278f65b6b51e2d069accae2fb4277a9..eee5763387b3d353de096ab878b1a7a53f2a92e0 100644 (file)
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -743,6 +743,11 @@ if test -z "$show_help"; then
             if test "$hardcode_direct" = no; then
               compile_command="$compile_command $dir/$linklib"
             elif test "$hardcode_minus_L" = no; then
+             case "$host" in
+             *-*-sunos*)
+                compile_shlibpath="$compile_shlibpath$dir:"
+               ;;
+             esac
               compile_command="$compile_command -L$dir -l$name"
             elif test "$hardcode_shlibpath_var" = no; then
               compile_shlibpath="$compile_shlibpath$dir:"
@@ -1055,8 +1060,8 @@ if test -z "$show_help"; then
          major=
          versuffix=
          verstring="0.0"
-         case "$version_type" in
-         sunos)
+         case "$host" in
+         *-*-sunos*)
            versuffix=".0.0"
            ;;
          esac
@@ -1662,6 +1667,7 @@ fi\
        addlibs="$convenience"
        build_libtool_libs=no
       else
+       oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^   ]*\.a //g' -e 's/[^   ]*\.lib //g' -e "$los2o" -e 's/ $//g'`
        addlibs="$old_convenience"
       fi
 
@@ -1756,7 +1762,7 @@ libdir='$install_libdir'\
 
     # There may be an optional sh(1) argument at the beginning of
     # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL"; then
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = "/bin/sh"; then
       # Aesthetically quote it.
       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
       case "$arg" in