diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in --- a/krunner/dbus/org.kde.krunner.service.in +++ b/krunner/dbus/org.kde.krunner.service.in @@ -1,4 +1,3 @@ [D-BUS Service] Name=org.kde.krunner -Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner - +Exec=@KDE_INSTALL_FULL_BINDIR@/krunner diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in --- a/kuiserver/org.kde.kuiserver.service.in +++ b/kuiserver/org.kde.kuiserver.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.kde.kuiserver -Exec=@CMAKE_INSTALL_PREFIX@/bin/kuiserver5 +Exec=@KDE_INSTALL_FULL_BINDIR@/kuiserver5 diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt --- a/startkde/CMakeLists.txt +++ b/startkde/CMakeLists.txt @@ -5,7 +5,7 @@ #FIXME: reconsider, looks fishy if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") - set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH") + set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${KDE_INSTALL_FULL_DATAROOTDIR}/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH") endif() configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -229,7 +229,7 @@ # to set it to a list of paths *not* including the KDE prefix if it's not /usr or # /usr/local. if test -z "$XDG_DATA_DIRS"; then - XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share" + XDG_DATA_DIRS="@KDE_INSTALL_FULL_DATAROOTDIR@:/usr/share:/usr/local/share" fi export XDG_DATA_DIRS diff --git a/startkde/waitforname/org.kde.plasma.Notifications.service.in b/startkde/waitforname/org.kde.plasma.Notifications.service.in --- a/startkde/waitforname/org.kde.plasma.Notifications.service.in +++ b/startkde/waitforname/org.kde.plasma.Notifications.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.Notifications -Exec=@CMAKE_INSTALL_PREFIX@/bin/plasma_waitforname org.freedesktop.Notifications +Exec=@KDE_INSTALL_FULL_BINDIR@/plasma_waitforname org.freedesktop.Notifications