Merge branch 'tari01-pr/drop-cmake-install-full-pkglibexecdir'

Attributes GH PR #28: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard/pull/28

6 files changed, 4 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index 95567325..73bc55b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 # vim: set ts=2 sts=2 sw=2 expandtab :
-dist: bionic
+dist: focal
 language: shell
 os: linux
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7185445b..2e014333 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,8 +33,6 @@ endif()
 
 # GNU standard installation directories
 include (GNUInstallDirs)
-set (CMAKE_INSTALL_PKGLIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
-set (CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
 
 # Gettext
 set(GETTEXT_PACKAGE "ayatana-indicator-keyboard")
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index c99dcdf6..1c9859be 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -10,7 +10,6 @@ if (${SYSTEMD_FOUND})
     set (SYSTEMD_USER_NAME "${CMAKE_PROJECT_NAME}.service")
     set (SYSTEMD_USER_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SYSTEMD_USER_NAME}")
     set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in")
-    set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
     configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}")
     install (FILES "${SYSTEMD_USER_FILE}" DESTINATION "${SYSTEMD_USER_DIR}")
 
@@ -23,7 +22,6 @@ message (STATUS "${XDG_AUTOSTART_DIR} is the DBus Service File install dir")
 set (XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.desktop")
 set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")
 set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")
-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
 configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
 install (FILES "${XDG_AUTOSTART_FILE}" DESTINATION "${XDG_AUTOSTART_DIR}")
 
diff --git a/data/ayatana-indicator-keyboard.desktop.in b/data/ayatana-indicator-keyboard.desktop.in
index f7db9936..6763ffa6 100644
--- a/data/ayatana-indicator-keyboard.desktop.in
+++ b/data/ayatana-indicator-keyboard.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Ayatana Indicator Keyboard
-Exec=@pkglibexecdir@/ayatana-indicator-keyboard-service
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-keyboard/ayatana-indicator-keyboard-service
 OnlyShowIn=Unity;MATE;XFCE;
 NoDisplay=true
 StartupNotify=false
diff --git a/data/ayatana-indicator-keyboard.service.in b/data/ayatana-indicator-keyboard.service.in
index 4a8e1a5d..82eab167 100644
--- a/data/ayatana-indicator-keyboard.service.in
+++ b/data/ayatana-indicator-keyboard.service.in
@@ -4,7 +4,7 @@ PartOf=graphical-session.target
 PartOf=ayatana-indicators.target
 
 [Service]
-ExecStart=@pkglibexecdir@/ayatana-indicator-keyboard-service
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-keyboard/ayatana-indicator-keyboard-service
 Restart=on-failure
 
 [Install]
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a94756a..7af25121 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,4 +25,4 @@ link_directories(${SERVICE_DEPS_LIBRARY_DIRS})
 
 add_executable("ayatana-indicator-keyboard-service" main.c)
 target_link_libraries("ayatana-indicator-keyboard-service" "ayatanaindicatorkeyboardservice" "${SERVICE_DEPS_LIBRARIES} -ldl")
-install(TARGETS "ayatana-indicator-keyboard-service" RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
+install(TARGETS "ayatana-indicator-keyboard-service" RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")