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
5 if test "$linkmode" = prog || test "$mode" = relink; then
10 # Finalize command for both is simple: just hardcode it.
11 @@ -2384,10 +2395,22 @@
15 + if test -n "$inst_prefix_dir"; then
18 + add_prefix_dir="-L$inst_prefix_dir$libdir"
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"
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"
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
38 if test "$linkmode" = prog || test "$mode" != relink; then
44 @@ -2384,10 +2395,22 @@
48 + if test -n "$inst_prefix_dir"; then
51 + add_prefix_dir="-L$inst_prefix_dir$libdir"
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"
60 test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
61 test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
63 + test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
64 test -n "$add_dir" && deplibs="$add_dir $deplibs"
65 test -n "$add" && deplibs="$add $deplibs"