From cfa79f06e225942d19903b52cc2ed74e966d3c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 23 Feb 2019 16:35:21 +0100 Subject: Use system libdir when searching for dynamically loaded libraries. This prevents finding an incorrect architecture on multi-arch systems. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 8a859540c3cb306844288144a06028dc302408d6) --- kdecore/ksocks.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kdecore') diff --git a/kdecore/ksocks.cpp b/kdecore/ksocks.cpp index e596c50d9..0f05c17e3 100644 --- a/kdecore/ksocks.cpp +++ b/kdecore/ksocks.cpp @@ -254,13 +254,13 @@ KSocks::KSocks(KConfigBase *config) : _socksLib(0L), _st(0L) { return; _libPaths << "" - << "/usr/lib" KDELIBSUFF "/" + << "/usr/" SYSTEM_LIBDIR "/" << "/usr/lib/" - << "/usr/local/lib" KDELIBSUFF "/" + << "/usr/local/" SYSTEM_LIBDIR "/" << "/usr/local/lib/" - << "/usr/local/socks5/lib" KDELIBSUFF "/" + << "/usr/local/socks5/" SYSTEM_LIBDIR "/" << "/usr/local/socks5/lib/" - << "/opt/socks5/lib" KDELIBSUFF "/" + << "/opt/socks5/" SYSTEM_LIBDIR "/" << "/opt/socks5/lib/"; _libNames << "libsocks.so" // Dante << "libdsocksd.so.0" // Dante 1.1.14-2 on -- cgit v1.2.1