Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: replace installation paths with KDE4_ prefixed

Browse source 
this is TODO from issue #9. CPack and CTest configs will not be
supported. most of the changes done to other repisitories is automated
via:

find -type f -exec sed -i -e 's|${INSTALL_DIR}|${KDE4_INSTALL_DIR}|g' \
    -e 's|${EXEC_INSTALL_PREFIX}|${KDE4_EXEC_INSTALL_PREFIX}|g' \
    -e 's|${SHARE_INSTALL_PREFIX}|${KDE4_SHARE_INSTALL_PREFIX}|g' \
    -e 's|${BIN_INSTALL_DIR}|${KDE4_BIN_INSTALL_DIR}|g' \
    -e 's|${SBIN_INSTALL_DIR}|${KDE4_SBIN_INSTALL_DIR}|g' \
    -e 's|${LIB_INSTALL_DIR}|${KDE4_LIB_INSTALL_DIR}|g' \
    -e 's|${LIBEXEC_INSTALL_DIR}|${KDE4_LIBEXEC_INSTALL_DIR}|g' \
    -e 's|${INCLUDE_INSTALL_DIR}|${KDE4_INCLUDE_INSTALL_DIR}|g' \
    -e 's|${PLUGIN_INSTALL_DIR}|${KDE4_PLUGIN_INSTALL_DIR}|g' \
    -e 's|${IMPORTS_INSTALL_DIR}|${KDE4_IMPORTS_INSTALL_DIR}|g' \
    -e 's|${CONFIG_INSTALL_DIR}|${KDE4_CONFIG_INSTALL_DIR}|g' \
    -e 's|${DATA_INSTALL_DIR}|${KDE4_DATA_INSTALL_DIR}|g' \
    -e 's|${ICON_INSTALL_DIR}|${KDE4_ICON_INSTALL_DIR}|g' \
    -e 's|${KCFG_INSTALL_DIR}|${KDE4_KCFG_INSTALL_DIR}|g' \
    -e 's|${LOCALE_INSTALL_DIR}|${KDE4_LOCALE_INSTALL_DIR}|g' \
    -e 's|${MIME_INSTALL_DIR}|${KDE4_MIME_INSTALL_DIR}|g' \
    -e 's|${SERVICES_INSTALL_DIR}|${KDE4_SERVICES_INSTALL_DIR}|g' \
    -e 's|${SERVICETYPES_INSTALL_DIR}|${KDE4_SERVICETYPES_INSTALL_DIR}|g' \
    -e 's|${SOUND_INSTALL_DIR}|${KDE4_SOUND_INSTALL_DIR}|g' \
    -e 's|${TEMPLATES_INSTALL_DIR}|${KDE4_TEMPLATES_INSTALL_DIR}|g' \
    -e 's|${WALLPAPER_INSTALL_DIR}|${KDE4_WALLPAPER_INSTALL_DIR}|g' \
    -e 's|${AUTOSTART_INSTALL_DIR}|${KDE4_AUTOSTART_INSTALL_DIR}|g' \
    -e 's|${XDG_APPS_INSTALL_DIR}|${KDE4_XDG_APPS_INSTALL_DIR}|g' \
    -e 's|${XDG_DIRECTORY_INSTALL_DIR}|${KDE4_XDG_DIRECTORY_INSTALL_DIR}|g' \
    -e 's|${XDG_MIME_INSTALL_DIR}|${KDE4_XDG_MIME_INSTALL_DIR}|g' \
    -e 's|${SYSCONF_INSTALL_DIR}|${KDE4_SYSCONF_INSTALL_DIR}|g' \
    -e 's|${MAN_INSTALL_DIR}|${KDE4_MAN_INSTALL_DIR}|g' \
    -e 's|${INFO_INSTALL_DIR}|${KDE4_INFO_INSTALL_DIR}|g' \
    -e 's|${DBUS_INTERFACES_INSTALL_DIR}|${KDE4_DBUS_INTERFACES_INSTALL_DIR}|g' \
    -e 's|${DBUS_SERVICES_INSTALL_DIR}|${KDE4_DBUS_SERVICES_INSTALL_DIR}|g' \
    -e 's|${DBUS_SYSTEM_SERVICES_INSTALL_DIR}|${KDE4_DBUS_SYSTEM_SERVICES_INSTALL_DIR}|g' \
    -e 's|${KAUTH_HELPER_PLUGIN_DIR}|${KDE4_KAUTH_HELPER_PLUGIN_DIR}|g' \
    -e 's|${KAUTH_BACKEND_PLUGIN_DIR}|${KDE4_KAUTH_BACKEND_PLUGIN_DIR}|g' {} +

note that if you execute this command you may corrupt the git repository
files so move the .git directory out of the way. you can also verify
that there are no other reference to the compatibility installation
paths via:

git grep \
    -e INSTALL_DIR \
    -e EXEC_INSTALL_PREFIX \
    -e SHARE_INSTALL_PREFIX \
    -e BIN_INSTALL_DIR \
    -e SBIN_INSTALL_DIR \
    -e LIB_INSTALL_DIR \
    -e LIBEXEC_INSTALL_DIR \
    -e INCLUDE_INSTALL_DIR \
    -e PLUGIN_INSTALL_DIR \
    -e IMPORTS_INSTALL_DIR \
    -e CONFIG_INSTALL_DIR \
    -e DATA_INSTALL_DIR \
    -e ICON_INSTALL_DIR \
    -e KCFG_INSTALL_DIR \
    -e LOCALE_INSTALL_DIR \
    -e MIME_INSTALL_DIR \
    -e SERVICES_INSTALL_DIR \
    -e SERVICETYPES_INSTALL_DIR \
    -e SOUND_INSTALL_DIR \
    -e TEMPLATES_INSTALL_DIR \
    -e WALLPAPER_INSTALL_DIR \
    -e AUTOSTART_INSTALL_DIR \
    -e XDG_APPS_INSTALL_DIR \
    -e XDG_DIRECTORY_INSTALL_DIR \
    -e XDG_MIME_INSTALL_DIR \
    -e SYSCONF_INSTALL_DIR \
    -e MAN_INSTALL_DIR \
    -e INFO_INSTALL_DIR \
    -e DBUS_INTERFACES_INSTALL_DIR \
    -e DBUS_SERVICES_INSTALL_DIR \
    -e DBUS_SYSTEM_SERVICES_INSTALL_DIR \
    -e KAUTH_HELPER_PLUGIN_DIR \
    -e KAUTH_BACKEND_PLUGIN_DIR | grep -v KDE4_

this change should make default installation Filesystem Hierarchy
Standard (FHS) compliant and packaging easier since library suffix (e.g.
64 for x86_64 hosts) will not have to be specified explicitly, it may
solve possible conflicts with installation path variables from other
projects which use custom installation paths aswell

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-02-08 20:46:43 +00:00
parent 80959a284b
commit 478ca250a2
11 changed files with 28 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ConfigureChecks.cmake
View file

@ -18,8 +18,6 @@ include(CheckPrototypeDefinition)
# definitions like _GNU_SOURCE that are needed on each platform.
set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS})
set( KDELIBSUFF ${LIB_SUFFIX} )
macro_bool_to_01(LIBINTL_FOUND ENABLE_NLS) # kdecore
check_include_files(stdio.h HAVE_STDIO_H) # various

37
KDE4Config.cmake
View file

@ -35,43 +35,6 @@ set(KDE4_DBUS_SYSTEM_SERVICES_INSTALL_DIR "@DBUS_SYSTEM_SERVICES_INSTALL_DIR@")
set(KDE4_KAUTH_HELPER_PLUGIN_DIR "@KAUTH_HELPER_PLUGIN_DIR@")
set(KDE4_KAUTH_BACKEND_PLUGIN_DIR "@KAUTH_BACKEND_PLUGIN_DIR@")
# those are for compatibility and will be gone in future release, they
# are set to ensure that installation directories override from vendors
# are respected trought all sub-packages
set(INSTALL_DIR "@CMAKE_INSTALL_PREFIX@")
set(EXEC_INSTALL_PREFIX "@EXEC_INSTALL_PREFIX@")
set(SHARE_INSTALL_PREFIX "@SHARE_INSTALL_PREFIX@")
set(BIN_INSTALL_DIR "@BIN_INSTALL_DIR@")
set(SBIN_INSTALL_DIR "@SBIN_INSTALL_DIR@")
set(LIB_INSTALL_DIR "@LIB_INSTALL_DIR@")
set(LIBEXEC_INSTALL_DIR "@LIBEXEC_INSTALL_DIR@")
set(INCLUDE_INSTALL_DIR "@INCLUDE_INSTALL_DIR@")
set(PLUGIN_INSTALL_DIR "@PLUGIN_INSTALL_DIR@")
set(IMPORTS_INSTALL_DIR "@IMPORTS_INSTALL_DIR@")
set(CONFIG_INSTALL_DIR "@CONFIG_INSTALL_DIR@")
set(DATA_INSTALL_DIR "@DATA_INSTALL_DIR@")
set(ICON_INSTALL_DIR "@ICON_INSTALL_DIR@")
set(KCFG_INSTALL_DIR "@KCFG_INSTALL_DIR@")
set(LOCALE_INSTALL_DIR "@LOCALE_INSTALL_DIR@")
set(MIME_INSTALL_DIR "@MIME_INSTALL_DIR@")
set(SERVICES_INSTALL_DIR "@SERVICES_INSTALL_DIR@")
set(SERVICETYPES_INSTALL_DIR "@SERVICETYPES_INSTALL_DIR@")
set(SOUND_INSTALL_DIR "@SOUND_INSTALL_DIR@")
set(TEMPLATES_INSTALL_DIR "@TEMPLATES_INSTALL_DIR@")
set(WALLPAPER_INSTALL_DIR "@WALLPAPER_INSTALL_DIR@")
set(AUTOSTART_INSTALL_DIR "@AUTOSTART_INSTALL_DIR@")
set(XDG_APPS_INSTALL_DIR "@XDG_APPS_INSTALL_DIR@")
set(XDG_DIRECTORY_INSTALL_DIR "@XDG_DIRECTORY_INSTALL_DIR@")
set(XDG_MIME_INSTALL_DIR "@XDG_MIME_INSTALL_DIR@")
set(SYSCONF_INSTALL_DIR "@SYSCONF_INSTALL_DIR@")
set(MAN_INSTALL_DIR "@MAN_INSTALL_DIR@")
set(INFO_INSTALL_DIR "@INFO_INSTALL_DIR@")
set(DBUS_INTERFACES_INSTALL_DIR "@DBUS_INTERFACES_INSTALL_DIR@")
set(DBUS_SERVICES_INSTALL_DIR "@DBUS_SERVICES_INSTALL_DIR@")
set(DBUS_SYSTEM_SERVICES_INSTALL_DIR "@DBUS_SYSTEM_SERVICES_INSTALL_DIR@")
set(KAUTH_HELPER_PLUGIN_DIR "@KAUTH_HELPER_PLUGIN_DIR@")
set(KAUTH_BACKEND_PLUGIN_DIR "@KAUTH_BACKEND_PLUGIN_DIR@")
# someone made exception once and will be gone in future release
set(DBUS_INTERFACES_DIR "@DBUS_INTERFACES_INSTALL_DIR@")
set(DBUS_SERVICES_DIR "@DBUS_SERVICES_INSTALL_DIR@")

44
cmake/modules/FindKDE4Internal.cmake
View file

@ -432,35 +432,25 @@ endif()
##################### some more settings ##########################################
# If we are building ! kdelibs, check where kdelibs are installed.
# If they are installed in a directory which contains "lib64", we default to "64" for LIB_SUFFIX,
# so the current project will by default also go into lib64.
# The same for lib32. Alex
set(_Init_LIB_SUFFIX "")
if ("${KDE4_LIB_DIR}" MATCHES lib64)
set(_Init_LIB_SUFFIX 64)
endif ("${KDE4_LIB_DIR}" MATCHES lib64)
if ("${KDE4_LIB_DIR}" MATCHES lib32)
set(_Init_LIB_SUFFIX 32)
endif ("${KDE4_LIB_DIR}" MATCHES lib32)
# FIXME: this should not be needed
macro(_set_fancy variable value)
set(${variable} "${value}")
set(${variable} "${value}" CACHE PATH "KDE standard path variable")
set(KDE4_${variable} "${value}")
set(KDE4_${variable} "${value}" CACHE PATH "KDE standard path variable")
endmacro()
set(LIB_SUFFIX "${_Init_LIB_SUFFIX}" CACHE STRING "Define suffix of directory name (32/64)")
# if bootstrap set the variablse now, otherwise they will be set by KDE4Config
if(_kdeBootStrapping)
include(GNUInstallDirs)
_set_fancy(EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
_set_fancy(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share")
_set_fancy(BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin")
_set_fancy(SBIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/sbin")
_set_fancy(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
_set_fancy(LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4/libexec")
_set_fancy(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include")
_set_fancy(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_FULL_DATADIR}")
_set_fancy(BIN_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}")
_set_fancy(SBIN_INSTALL_DIR "${CMAKE_INSTALL_FULL_SBINDIR}")
_set_fancy(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
_set_fancy(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kde4")
_set_fancy(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
_set_fancy(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}")
_set_fancy(IMPORTS_INSTALL_DIR "${PLUGIN_INSTALL_DIR}/kde4/imports")
@ -468,7 +458,7 @@ if(_kdeBootStrapping)
_set_fancy(DATA_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/apps")
_set_fancy(ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons")
_set_fancy(KCFG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config.kcfg")
_set_fancy(LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale")
_set_fancy(LOCALE_INSTALL_DIR "${CMAKE_INSTALL_FULL_LOCALEDIR}")
_set_fancy(MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mimelnk")
_set_fancy(SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/services")
_set_fancy(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/servicetypes")
@ -481,9 +471,9 @@ if(_kdeBootStrapping)
_set_fancy(XDG_DIRECTORY_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/desktop-directories")
_set_fancy(XDG_MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mime/packages")
_set_fancy(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc")
_set_fancy(MAN_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/man")
_set_fancy(INFO_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/info")
_set_fancy(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
_set_fancy(MAN_INSTALL_DIR "${CMAKE_INSTALL_FULL_MANDIR}")
_set_fancy(INFO_INSTALL_DIR "${CMAKE_INSTALL_FULL_INFODIR}")
_set_fancy(DBUS_INTERFACES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces")
_set_fancy(DBUS_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/services")
_set_fancy(DBUS_SYSTEM_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/system-services")
@ -502,9 +492,9 @@ endif()
# -everything except the development files: cmake -DCOMPONENT=Unspecified -P cmake_install.cmake
# This can then also be used for packaging with cpack.
set(INSTALL_TARGETS_DEFAULT_ARGS
RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
RUNTIME DESTINATION "${KDE4_BIN_INSTALL_DIR}"
LIBRARY DESTINATION "${KDE4_LIB_INSTALL_DIR}"
ARCHIVE DESTINATION "${KDE4_LIB_INSTALL_DIR}"
COMPONENT Devel
)

12
cmake/modules/KDE4Defaults.cmake
View file

@ -1,15 +1,3 @@
# support for Dart: https://open.cdash.org/
if(EXISTS ${CMAKE_SOURCE_DIR}/CTestConfig.cmake)
include(${CMAKE_SOURCE_DIR}/CTestConfig.cmake)
include(CTest)
endif()
# support for easy packaging
if(EXISTS ${CMAKE_SOURCE_DIR}/CPackConfig.cmake)
include(${CMAKE_SOURCE_DIR}/CPackConfig.cmake)
include(CPack)
endif()
# let cmake handle mocking and UI compiling
# since cmake 2.8.6
set(CMAKE_AUTOMOC ON)

8
cmake/modules/KDE4Macros.cmake
View file

@ -349,7 +349,7 @@ endmacro(KDE4_ADD_WIDGET)
# system bus, and a service file for letting the helper being automatically
# activated by the system bus.
#
# *WARNING* You have to install the helper in ${LIBEXEC_INSTALL_DIR} to make
# *WARNING* You have to install the helper in ${KDE4_LIBEXEC_INSTALL_DIR} to make
# sure everything will work.
function(KDE4_INSTALL_AUTH_HELPER_FILES HELPER_TARGET HELPER_ID HELPER_USER)
if (_kdeBootStrapping)
@ -361,12 +361,12 @@ function(KDE4_INSTALL_AUTH_HELPER_FILES HELPER_TARGET HELPER_ID HELPER_USER)
configure_file(${_stubFilesDir}/dbus_policy.stub
${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf
DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/)
DESTINATION ${KDE4_SYSCONF_INSTALL_DIR}/dbus-1/system.d/)
configure_file(${_stubFilesDir}/dbus_service.stub
${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service
DESTINATION ${DBUS_SYSTEM_SERVICES_INSTALL_DIR})
DESTINATION ${KDE4_DBUS_SYSTEM_SERVICES_INSTALL_DIR})
endfunction(KDE4_INSTALL_AUTH_HELPER_FILES)
@ -377,7 +377,7 @@ macro(KDE4_INSTALL_TS_FILES _lang _sdir)
get_filename_component(_subpath ${_current_TS_FILES} PATH)
install(
FILES ${_current_TS_FILES}
DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_SCRIPTS/${_subpath}
DESTINATION ${KDE4_LOCALE_INSTALL_DIR}/${_lang}/LC_SCRIPTS/${_subpath}
)
endif()
endforeach()

2
cmake/modules/MacroDBusAddActivationService.cmake
View file

@ -4,6 +4,6 @@ macro(dbus_add_activation_service _sources)
string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_output_file})
configure_file(${_service_file} ${_target})
install(FILES ${_target} DESTINATION ${DBUS_SERVICES_INSTALL_DIR} )
install(FILES ${_target} DESTINATION ${KDE4_DBUS_SERVICES_INSTALL_DIR})
endforeach (_i ${ARGN})
endmacro(dbus_add_activation_service _sources)

2
cmake/modules/PkgConfigGetVar.cmake
View file

@ -26,7 +26,7 @@ macro(dbus_add_activation_service _sources)
string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_output_file})
configure_file(${_service_file} ${_target})
install(FILES ${_target} DESTINATION ${DBUS_SERVICES_INSTALL_DIR} )
install(FILES ${_target} DESTINATION ${KDE4_DBUS_SERVICES_INSTALL_DIR} )
#install(FILES ${_target} DESTINATION ${_install_dir})
endforeach (_i ${ARGN})
endmacro(dbus_add_activation_service _sources)

4
config.h.cmake
View file

@ -6,10 +6,6 @@
/****************************/
#define KDELIBSUFF "${KDELIBSUFF}"
/****************************/
/* Define to 1 if you have stdio.h */
#cmakedefine HAVE_STDIO_H 1

9
kdecore/kde-config.cpp
View file

@ -74,7 +74,6 @@ int main(int argc, char **argv)
options.add("expandvars", ki18n("Left for legacy support"));
options.add("prefix", ki18n("Compiled in prefix for KDE libraries"));
options.add("exec-prefix", ki18n("Compiled in exec_prefix for KDE libraries"));
options.add("libsuffix", ki18n("Compiled in library path suffix"));
options.add("localprefix", ki18n("Prefix in $HOME used to write files"));
options.add("kde-version", ki18n("Compiled in version string for KDE libraries"));
options.add("types", ki18n("Available KDE resource types"));
@ -107,14 +106,6 @@ int main(int argc, char **argv)
return 0;
}
if (args->isSet("libsuffix"))
{
QString tmp(QFile::decodeName(KDELIBSUFF));
tmp.remove(QLatin1Char('"'));
printResult(tmp);
return 0;
}
if (args->isSet("localprefix"))
{
printResult(KGlobal::dirs()->localkdedir());

5
kdecore/kernel/kstandarddirs.cpp
View file

@ -1538,8 +1538,8 @@ void KStandardDirs::addKDEDefaults()
}
// end XDG_DATA_XXX
addResourceType("lib", 0, QLatin1String("lib" KDELIBSUFF "/"));
addResourceDir("lib", QLatin1String(LIB_INSTALL_DIR "/"), true);
addResourceDir("exe", QLatin1String(LIBEXEC_INSTALL_DIR), true );
addResourceType("qtplugins", "lib", QLatin1String("plugins"));
@ -1549,7 +1549,6 @@ void KStandardDirs::addKDEDefaults()
QLatin1String(types_string + types_indices[index+1]), true);
index+=2;
}
addResourceType("exe", "lib", QLatin1String("kde4/libexec"), true );
addResourceDir("home", QDir::homePath(), false);

6
kdecore/tests/kstandarddirstest.cpp
View file

@ -87,7 +87,7 @@ void KStandarddirsTest::testFindResource()
QSKIP( "kdelibs not installed", SkipAll );
#define EXT ""
#define KIOSLAVE "kde4/libexec/kioslave"
#define KIOSLAVE "/kioslave"
const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
QVERIFY( !bin.isEmpty() );
QVERIFY( bin.endsWith( KIOSLAVE ) );
@ -232,11 +232,11 @@ 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("/lnusertemp" EXT, PATH_SENSITIVITY ) );
// locate("exe") with a result in libexec
const QString locateExeResult = KGlobal::dirs()->locate("exe", "lnusertemp");
QVERIFY(locateExeResult.endsWith("lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY));
QVERIFY(locateExeResult.endsWith("/lnusertemp" EXT, PATH_SENSITIVITY));
// findExe with relative path
const QString pwd = QDir::currentPath();