diff -up kdelibs-4.9.97/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.9.97/kdecore/kernel/kstandarddirs.cpp --- kdelibs-4.9.97/kdecore/kernel/kstandarddirs.cpp.libexecdir 2012-12-17 08:14:17.000000000 -0600 +++ kdelibs-4.9.97/kdecore/kernel/kstandarddirs.cpp 2013-01-03 14:56:38.768459213 -0600 @@ -1871,7 +1871,7 @@ void KStandardDirs::addKDEDefaults() addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true); index+=2; } - addResourceType("exe", "lib", "kde4/libexec", true ); + addResourceType("exe", 0, "libexec/kde4", true ); addResourceDir("home", QDir::homePath(), false); diff -up kdelibs-4.9.97/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.9.97/kdecore/kernel/kstandarddirs_unix.cpp --- kdelibs-4.9.97/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2012-12-17 08:14:16.000000000 -0600 +++ kdelibs-4.9.97/kdecore/kernel/kstandarddirs_unix.cpp 2013-01-03 14:56:38.768459213 -0600 @@ -63,7 +63,7 @@ QString KStandardDirs::installPath(const if (strcmp("lib", type) == 0) return QFile::decodeName(LIB_INSTALL_DIR "/"); if (strcmp("libexec", type) == 0) - return QFile::decodeName(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/"); + return QFile::decodeName(LIBEXEC_INSTALL_DIR "/"); if (strcmp("locale", type) == 0) return QFile::decodeName(LOCALE_INSTALL_DIR "/"); break; diff -up kdelibs-4.9.97/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.9.97/kdecore/tests/kstandarddirstest.cpp --- kdelibs-4.9.97/kdecore/tests/kstandarddirstest.cpp.libexecdir 2012-12-17 08:14:17.000000000 -0600 +++ kdelibs-4.9.97/kdecore/tests/kstandarddirstest.cpp 2013-01-03 14:56:38.769459202 -0600 @@ -96,8 +96,9 @@ void KStandarddirsTest::testFindResource #define KIOSLAVE "bin/kioslave.exe" #else #define EXT "" -#define KIOSLAVE "kde4/libexec/kioslave" +#define KIOSLAVE "libexec/kde4/kioslave" #endif + const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT ); QVERIFY( !bin.isEmpty() ); QVERIFY( bin.endsWith( KIOSLAVE ) ); @@ -231,7 +232,8 @@ void KStandarddirsTest::testFindExe() // findExe with a result in libexec const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" ); QVERIFY( !lnusertemp.isEmpty() ); - QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY ) ); + QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY ) + || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT, PATH_SENSITIVITY ) ); #endif #ifndef Q_OS_MAC // kdeinit4 is a bundle on Mac, so the below doesn't work diff -up kdelibs-4.9.97/kio/tests/krununittest.cpp.libexecdir kdelibs-4.9.97/kio/tests/krununittest.cpp