From bab7087b15336e5635289bcd5a47709693a21c4c Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Wed, 16 Feb 2022 10:36:14 +0100
Subject: Drop pkglibexecdir and use native CMake file configuration

---
 data/CMakeLists.txt                       | 1 -
 data/ayatana-indicator-display.conf.in    | 2 +-
 data/ayatana-indicator-display.service.in | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index cd052b6..17ddf23 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -32,7 +32,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
diff --git a/data/ayatana-indicator-display.conf.in b/data/ayatana-indicator-display.conf.in
index 1231b5e..0254a34 100644
--- a/data/ayatana-indicator-display.conf.in
+++ b/data/ayatana-indicator-display.conf.in
@@ -6,4 +6,4 @@ stop on desktop-end or ayatana-indicator-services-end
 respawn
 respawn limit 2 10
 
-exec @pkglibexecdir@/ayatana-indicator-display-service
+exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-display/ayatana-indicator-display-service
diff --git a/data/ayatana-indicator-display.service.in b/data/ayatana-indicator-display.service.in
index cdfc1e0..4ae5d2b 100644
--- a/data/ayatana-indicator-display.service.in
+++ b/data/ayatana-indicator-display.service.in
@@ -4,7 +4,7 @@ PartOf=graphical-session.target
 PartOf=ayatana-indicators.target
 
 [Service]
-ExecStart=@pkglibexecdir@/ayatana-indicator-display-service
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-display/ayatana-indicator-display-service
 Restart=on-failure
 
 [Install]
-- 
cgit v1.2.3