diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-02-23 16:35:21 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-02-24 04:22:56 +0100 |
| commit | 8a859540c3cb306844288144a06028dc302408d6 (patch) | |
| tree | ab30cacb69adc9e2419162224d5cfa9bddeb11b7 /tdecore | |
| parent | c49ee53043b73fac7fe7e956360f1e3cdc342c6e (diff) | |
| download | tdelibs-8a859540c3cb306844288144a06028dc302408d6.tar.gz tdelibs-8a859540c3cb306844288144a06028dc302408d6.zip | |
Use system libdir when searching for dynamically loaded libraries.
This prevents finding an incorrect architecture on multi-arch systems.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'tdecore')
| -rw-r--r-- | tdecore/ksocks.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp index a6ecc37d2..6fac3179e 100644 --- a/tdecore/ksocks.cpp +++ b/tdecore/ksocks.cpp @@ -254,13 +254,13 @@ KSocks::KSocks(TDEConfigBase *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 |