diff -ur kdelibs-4.1.0/kdecore/kernel/kstandarddirs.cpp kdelibs-4.1.0-kstandarddirs/kdecore/kernel/kstandarddirs.cpp --- kdelibs-4.1.0/kdecore/kernel/kstandarddirs.cpp 2008-07-09 15:28:22.000000000 +0200 +++ kdelibs-4.1.0-kstandarddirs/kdecore/kernel/kstandarddirs.cpp 2008-08-29 00:07:51.000000000 +0200 @@ -996,7 +996,9 @@ pit != prefixList->end(); ++pit) { - if((*pit)!=installprefix||installdir.isEmpty()) + // "exe" never has a custom install path, and the check triggers + // a false positive due to the libexecdir patch + if((*pit)!=installprefix||installdir.isEmpty()||!strcmp("exe", type)) { for (QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) @@ -1010,6 +1012,11 @@ if ((local || testdir.exists()) && !candidates.contains(path)) candidates.append(path); } + // special-case "config" (forward porting Chris Cheney's + // hack) - we want /etc/kde after the local config paths + // and before the ones in /usr (including kde-profile) + if (local && !strcmp("config", type)) + candidates.append("/etc/kde/"); local = false; } else