Commit e0494753 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Use KDEInstallDir variables instead of custom calculated install paths

Summary:
Consistent usage of install variables avoids mismatches for people who
make use of custom settings of install paths.

Reviewers: #plasma, apol

Reviewed By: apol

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D10400
parent 56600554
[D-BUS Service]
Name=org.kde.krunner
Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner
Exec=@KDE_INSTALL_FULL_BINDIR@/krunner
[D-BUS Service]
Name=org.kde.kuiserver
Exec=@CMAKE_INSTALL_PREFIX@/bin/kuiserver5
Exec=@KDE_INSTALL_FULL_BINDIR@/kuiserver5
......@@ -5,7 +5,7 @@ add_subdirectory(waitforname)
#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)
......
......@@ -229,7 +229,7 @@ echo 'startkde: Starting up...' 1>&2
# 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
......
[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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment