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-27 20:20:20 +0100 |
| commit | cfa79f06e225942d19903b52cc2ed74e966d3c3f (patch) | |
| tree | 9b9cd88f300a81e80e511bba11d59c224f2a2c93 /kdeprint | |
| parent | 4e6b9128f722d7a45188b2c2fc3ecdb887de6cc9 (diff) | |
| download | tdelibs-cfa79f06e225942d19903b52cc2ed74e966d3c3f.tar.gz tdelibs-cfa79f06e225942d19903b52cc2ed74e966d3c3f.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>
(cherry picked from commit 8a859540c3cb306844288144a06028dc302408d6)
Diffstat (limited to 'kdeprint')
| -rw-r--r-- | kdeprint/cups/cupsdconf2/cupsdconf.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.cpp b/kdeprint/cups/cupsdconf2/cupsdconf.cpp index 638d0645d..3b57c2e12 100644 --- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdconf.cpp @@ -71,10 +71,15 @@ CupsdConf::CupsdConf() //fontpath_ << (datadir_+"/fonts"); requestdir_ = findDir(TQStringList("/var/spool/cups") << "/var/cups"); - serverbin_ = findDir(TQStringList("/usr/lib" KDELIBSUFF "/cups") - << "/usr/local/lib" KDELIBSUFF "/cups" - << "/opt/lib" KDELIBSUFF "/cups" - << "/opt/local/lib" KDELIBSUFF "/cups"); + serverbin_ = findDir(TQStringList() + << "/usr/" SYSTEM_LIBDIR "/cups" + << "/usr/lib/cups" + << "/usr/local/" SYSTEM_LIBDIR "/cups" + << "/usr/local/lib/cups" + << "/opt/" SYSTEM_LIBDIR "/cups" + << "/opt/lib/cups" + << "/opt/local/" SYSTEM_LIBDIR "/cups" + << "/opt/local/lib/cups"); serverfiles_ = findDir(TQStringList("/etc/cups") << "/usr/local/etc/cups"); tmpfiles_ = requestdir_+"/tmp"; |