mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-02 18:29:13 +08:00
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 3547cae..e13a5bf 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -366,25 +366,25 @@ if test "x$ABI" != xstandard ; then
|
||
|
|
else
|
||
|
|
# The dash builtin pwd tries to be "helpful" and remember
|
||
|
|
# symlink names. Use -P option, and hope it's portable enough.
|
||
|
|
- test -d /usr/lib${ABI} \
|
||
|
|
- && (cd /usr/lib${ABI} && pwd -P | grep >/dev/null "/lib${ABI}"'$') \
|
||
|
|
- && libdir='${exec_prefix}/'"lib${ABI}"
|
||
|
|
+ test -d /usr/lib \
|
||
|
|
+ && (cd /usr/lib && pwd -P | grep >/dev/null "/lib"'$') \
|
||
|
|
+ && libdir='${exec_prefix}/'"lib"
|
||
|
|
fi
|
||
|
|
;;
|
||
|
|
# On freebsd, it seems 32-bit libraries are in lib32,
|
||
|
|
# and 64-bit in lib. Don't know about "kfreebsd", does
|
||
|
|
# it follow the Linux fhs conventions?
|
||
|
|
*:freebsd*:32)
|
||
|
|
- libdir='${exec_prefix}/lib32'
|
||
|
|
+ libdir='${exec_prefix}/lib'
|
||
|
|
;;
|
||
|
|
*:freebsd*:64)
|
||
|
|
libdir='${exec_prefix}/lib'
|
||
|
|
;;
|
||
|
|
*:irix*:32)
|
||
|
|
- libdir='${exec_prefix}/lib32'
|
||
|
|
+ libdir='${exec_prefix}/lib'
|
||
|
|
;;
|
||
|
|
*:irix*:64)
|
||
|
|
- libdir='${exec_prefix}/lib64'
|
||
|
|
+ libdir='${exec_prefix}/lib'
|
||
|
|
;;
|
||
|
|
*)
|
||
|
|
AC_MSG_WARN([Don't know where to install $ABI-bit libraries on this system.]); dnl '
|