projects / packages / libtool.git / blame
| Commit | Line | Data |
|---|---|---|
| cb2799b3 AF |
1 | --- libtool-1.4e/ltmain.sh.wiget Tue Jan 28 12:40:13 2003 |
| 2 | +++ libtool-1.4e/ltmain.sh Tue Jan 28 14:39:27 2003 | |
| cb2799b3 | 3 | @@ -2356,6 +2366,7 @@ |
| a78d25c2 AM |
4 | |
| 5 | if test "$linkmode" = prog || test "$mode" = relink; then | |
| 6 | add_shlibpath= | |
| 7 | + add_prefix_dir= | |
| 8 | add_dir= | |
| 9 | add= | |
| 10 | # Finalize command for both is simple: just hardcode it. | |
| cb2799b3 | 11 | @@ -2384,10 +2395,22 @@ |
| a78d25c2 AM |
12 | add="-l$name" |
| 13 | fi | |
| 14 | ||
| 15 | + if test -n "$inst_prefix_dir"; then | |
| 16 | + case "$libdir" in | |
| 17 | + [\\/]*) | |
| 18 | + add_prefix_dir="-L$inst_prefix_dir$libdir" | |
| 19 | + ;; | |
| 20 | + esac | |
| 21 | + fi | |
| 22 | + | |
| 23 | + # add_prefix_dir must be appended instead, otherwise it can | |
| 24 | + # possibly be overrided by any hardcoded -L/... path in deplibs | |
| 25 | if test "$linkmode" = prog; then | |
| 26 | + test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" | |
| 27 | test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" | |
| 28 | test -n "$add" && finalize_deplibs="$add $finalize_deplibs" | |
| 29 | else | |
| 30 | + test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir" | |
| 31 | test -n "$add_dir" && deplibs="$add_dir $deplibs" | |
| 32 | test -n "$add" && deplibs="$add $deplibs" | |
| 33 | fi | |
| cb2799b3 AF |
34 | --- libtool-1.4e/ltmain.in.wiget Tue Jan 28 14:11:13 2003 |
| 35 | +++ libtool-1.4e/ltmain.in Tue Jan 28 14:47:59 2003 | |
| cb2799b3 | 36 | @@ -2279,6 +2289,7 @@ |
| 485bc36f | 37 | |
| cb2799b3 | 38 | if test "$linkmode" = prog || test "$mode" != relink; then |
| 485bc36f AF |
39 | add_shlibpath= |
| 40 | + add_prefix_dir= | |
| 41 | add_dir= | |
| 42 | add= | |
| cb2799b3 AF |
43 | lib_linked=yes |
| 44 | @@ -2384,10 +2395,22 @@ | |
| 485bc36f AF |
45 | add="-l$name" |
| 46 | fi | |
| 47 | ||
| cb2799b3 AF |
48 | + if test -n "$inst_prefix_dir"; then |
| 49 | + case "$libdir" in | |
| 50 | + [\\/]*) | |
| 51 | + add_prefix_dir="-L$inst_prefix_dir$libdir" | |
| 52 | + ;; | |
| 53 | + esac | |
| 54 | + fi | |
| 55 | + | |
| 56 | + # add_prefix_dir must be appended instead, otherwise it can | |
| 57 | + # possibly be overrided by any hardcoded -L/... path in deplibs | |
| 58 | if test "$linkmode" = prog; then | |
| 59 | + test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" | |
| 485bc36f AF |
60 | test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" |
| 61 | test -n "$add" && finalize_deplibs="$add $finalize_deplibs" | |
| 62 | else | |
| cb2799b3 | 63 | + test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir" |
| 485bc36f AF |
64 | test -n "$add_dir" && deplibs="$add_dir $deplibs" |
| 65 | test -n "$add" && deplibs="$add $deplibs" | |
| 66 | fi |