kgreeter: set Exec to the full path to lightdm-kgreeter-greeter executable

fixes greeter start in some cases (such as when PATH does not include
/usr/sbin by default even if the current user is root, e.g. on Arch Linux)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kgreeter/CMakeLists.txt b/kgreeter/CMakeLists.txt
index e3f9a9e..776f29d 100644 (file)
--- a/kgreeter/CMakeLists.txt
+++ b/kgreeter/CMakeLists.txt
@@ -2,6 +2,11 @@ project(kgreeter)
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1603)
 
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/lightdm-kgreeter-greeter.desktop.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/lightdm-kgreeter-greeter.desktop
+)
+
 find_package(GLIB2)
 set_package_properties(GLIB2 PROPERTIES
     DESCRIPTION "Low-level core library that forms the basis for projects such as GTK and GNOME"
@@ -46,7 +51,7 @@ install(
 )
 
 install(
-    FILES lightdm-kgreeter-greeter.desktop
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/lightdm-kgreeter-greeter.desktop
     DESTINATION ${KDE4_SHARE_INSTALL_PREFIX}/xgreeters
 )
 

diff --git a/kgreeter/lightdm-kgreeter-greeter.desktop b/kgreeter/lightdm-kgreeter-greeter.desktop.cmake
similarity index 75%
rename from kgreeter/lightdm-kgreeter-greeter.desktop
rename to kgreeter/lightdm-kgreeter-greeter.desktop.cmake
index ee4fa33..5831035 100644 (file)
--- a/kgreeter/lightdm-kgreeter-greeter.desktop
+++ b/kgreeter/lightdm-kgreeter-greeter.desktop.cmake
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=LightDM KGreeter Greeter
 Comment=This runs the KGreeter greeter, it should only be run from LightDM
-Exec=lightdm-kgreeter-greeter
+Exec=@KDE4_SBIN_INSTALL_DIR@/lightdm-kgreeter-greeter
 Type=Application
 X-Ubuntu-Gettext-Domain=lightdm