libtool: Don't use the libdir path found in .la files. Fixes the build of various packages.

SVN-Revision: 19422
This commit is contained in:
Lars-Peter Clausen 2010-01-30 18:08:45 +00:00
parent 508cab829c
commit 51d6591729

View file

@ -10,6 +10,15 @@
(rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT) (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)
--- a/ltmain.in --- a/ltmain.in
+++ b/ltmain.in +++ b/ltmain.in
@@ -2827,7 +2827,7 @@ EOF
fi
else
# We cannot seem to hardcode it, guess we'll fake it.
- add_dir="-L$libdir"
+ add_dir="-L@GLOBAL_LIBDIR@"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -5669,7 +5669,7 @@ fi\ @@ -5669,7 +5669,7 @@ fi\
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
exit $EXIT_FAILURE exit $EXIT_FAILURE