- cleanup + bugfix in ltmain.sh part

Changed files:
    libtool-relink.patch -> 1.7

diff --git a/libtool-relink.patch b/libtool-relink.patch
index f7472081542aeafc1ecbe4ba427cba7a71dde9e8..4ff087c14cae67afed04c3f8da700560fda6c34c 100644 (file)
--- a/libtool-relink.patch
+++ b/libtool-relink.patch
@@ -35,32 +35,32 @@
 +++ libtool-1.4e/ltmain.in     Tue Jan 28 14:47:59 2003
 @@ -2279,6 +2289,7 @@
  
-         if test "$linkmode" = prog || test "$mode" != relink; then
+         if test "$linkmode" = prog || test "$mode" = relink; then
            add_shlibpath=
 +          add_prefix_dir=
            add_dir=
            add=
-           lib_linked=yes
+           # Finalize command for both is simple: just hardcode it.
 @@ -2384,10 +2395,22 @@
              add="-l$name"
            fi
  
-+          if test -n "$inst_prefix_dir"; then
-+            case "$libdir" in
-+            [\\/]*)
-+              add_prefix_dir="-L$inst_prefix_dir$libdir"
-+              ;;
-+            esac
-+          fi
-+  
-+          # add_prefix_dir must be appended instead, otherwise it can
-+          # possibly be overrided by any hardcoded -L/... path in deplibs
++          if test -n "$inst_prefix_dir"; then
++            case "$libdir" in
++            [\\/]*)
++              add_prefix_dir="-L$inst_prefix_dir$libdir"
++              ;;
++            esac
++          fi
++
++          # add_prefix_dir must be appended instead, otherwise it can
++          # possibly be overrided by any hardcoded -L/... path in deplibs
            if test "$linkmode" = prog; then
-+            test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir"
++            test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir"
              test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
              test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
            else
-+            test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
++            test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
              test -n "$add_dir" && deplibs="$add_dir $deplibs"
              test -n "$add" && deplibs="$add $deplibs"
            fi