From 2e4ec651a5a12e8d46d1afd17b614aa290306ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 16 Jun 2014 13:33:20 +0200 Subject: [PATCH] Don't install ksyncdbusenv to /kf5 in libexecdir That's reserved for kf5 parts which plasma-workspace obviously does not belong to. --- startkde/ksyncdbusenv/CMakeLists.txt | 2 +- startkde/startkde.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/startkde/ksyncdbusenv/CMakeLists.txt b/startkde/ksyncdbusenv/CMakeLists.txt index 9fabf1589..6f085937e 100644 --- a/startkde/ksyncdbusenv/CMakeLists.txt +++ b/startkde/ksyncdbusenv/CMakeLists.txt @@ -2,4 +2,4 @@ add_executable(ksyncdbusenv ksyncdbusenv.cpp) ecm_mark_nongui_executable(ksyncdbusenv) target_link_libraries(ksyncdbusenv Qt5::Core Qt5::DBus) -install(TARGETS ksyncdbusenv DESTINATION ${CMAKE_INSTALL_PREFIX}/${KF5_LIBEXEC_INSTALL_DIR}) +install(TARGETS ksyncdbusenv DESTINATION ${LIBEXEC_INSTALL_DIR}) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake index e68ee77ef..ea0bdfe0f 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -343,7 +343,7 @@ if test -n "PAM_KWALLET_LOGIN" ; then fi # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -@CMAKE_INSTALL_PREFIX@/@KF5_LIBEXEC_INSTALL_DIR@/ksyncdbusenv +@CMAKE_INSTALL_PREFIX@/@LIBEXEC_INSTALL_DIR@/ksyncdbusenv if test $? -ne 0; then # Startup error echo 'startkde: Could not sync environment to dbus.' 1>&2