diff options
| author | Slávek Banko <[email protected]> | 2019-02-23 16:35:21 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2019-02-27 20:18:17 +0100 |
| commit | 33c3818ac59fda3a00b7cff19fd3b1f09296fe5d (patch) | |
| tree | 0d5d3e3353303d875922d428ae28464e9d121930 /tdeprint | |
| parent | 89609911f85667e0e46b89e15023081cd6724677 (diff) | |
| download | tdelibs-33c3818ac59fda3a00b7cff19fd3b1f09296fe5d.tar.gz tdelibs-33c3818ac59fda3a00b7cff19fd3b1f09296fe5d.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 <[email protected]>
(cherry picked from commit 8a859540c3cb306844288144a06028dc302408d6)
Diffstat (limited to 'tdeprint')
| -rw-r--r-- | tdeprint/cups/cupsdconf2/cupsdconf.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tdeprint/cups/cupsdconf2/cupsdconf.cpp b/tdeprint/cups/cupsdconf2/cupsdconf.cpp index 2c5610411..5cfab057d 100644 --- a/tdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/tdeprint/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"; |