summaryrefslogtreecommitdiffstats
path: root/tdeprint/cups/cupsdconf2
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-02-23 16:35:21 +0100
committerSlávek Banko <slavek.banko@axis.cz>2019-02-24 04:22:56 +0100
commit8a859540c3cb306844288144a06028dc302408d6 (patch)
treeab30cacb69adc9e2419162224d5cfa9bddeb11b7 /tdeprint/cups/cupsdconf2
parentc49ee53043b73fac7fe7e956360f1e3cdc342c6e (diff)
downloadtdelibs-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 'tdeprint/cups/cupsdconf2')
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdconf.cpp13
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";