From a9e3f58eefe4ae8c6c0cbf804189982fe37bfff8 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Mon, 14 Feb 2022 21:03:35 +0100
Subject: Drop pkglibexecdir and use native CMake file configuration

---
 CMakeLists.txt                          | 2 --
 data/CMakeLists.txt                     | 2 --
 data/ayatana-indicator-power.desktop.in | 2 +-
 data/ayatana-indicator-power.service.in | 2 +-
 src/CMakeLists.txt                      | 2 +-
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bdab9d..4a25fb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,8 +39,6 @@ add_definitions("-Wno-sign-compare") # Needed for GTest on Ubuntu
 ##
 
 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
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index ec46edd..e269b30 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -29,7 +29,6 @@ if (${SYSTEMD_FOUND})
     set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in")
 
     # build it
-    set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
     configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}")
 
     # install it
@@ -50,7 +49,6 @@ set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")
 set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")
 
 # build it
-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
 configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
 
 # install it
diff --git a/data/ayatana-indicator-power.desktop.in b/data/ayatana-indicator-power.desktop.in
index 9e301aa..339a7cd 100644
--- a/data/ayatana-indicator-power.desktop.in
+++ b/data/ayatana-indicator-power.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Ayatana Indicator Power
-Exec=@pkglibexecdir@/ayatana-indicator-power-service
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-power/ayatana-indicator-power-service
 OnlyShowIn=Unity;MATE;XFCE;
 NoDisplay=true
 StartupNotify=false
diff --git a/data/ayatana-indicator-power.service.in b/data/ayatana-indicator-power.service.in
index dafac52..5e1dfca 100644
--- a/data/ayatana-indicator-power.service.in
+++ b/data/ayatana-indicator-power.service.in
@@ -4,7 +4,7 @@ PartOf=graphical-session.target
 PartOf=ayatana-indicators.target
 
 [Service]
-ExecStart=@pkglibexecdir@/ayatana-indicator-power-service
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-power/ayatana-indicator-power-service
 Restart=on-failure
 
 [Install]
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 12fa6bb..a98f90e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,4 +46,4 @@ link_directories(${SERVICE_DEPS_LIBRARY_DIRS})
 # the executable: lib + main()
 add_executable (${SERVICE_EXEC} main.c)
 target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES})
-install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
+install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
-- 
cgit v1.2.3