aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2022-02-16 11:35:31 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2022-02-16 11:35:31 +0100
commit76070b4ce4fd7bf46604c5e1418a186b018e7635 (patch)
tree80a77eedd3549e1f3fee363b2fc6114dcd2b2e89
parent3b04d065dfd52567836a4c9b624db4b694084a3a (diff)
parent7276ec3b8266e53529fc92aca6e239eb95548c6e (diff)
downloadayatana-indicator-session-76070b4ce4fd7bf46604c5e1418a186b018e7635.tar.gz
ayatana-indicator-session-76070b4ce4fd7bf46604c5e1418a186b018e7635.tar.bz2
ayatana-indicator-session-76070b4ce4fd7bf46604c5e1418a186b018e7635.zip
Merge branch 'tari01-pr/drop-cmake-install-full-pkglibexecdir'
Attributes GH PR #71: https://github.com/AyatanaIndicators/ayatana-indicator-session/pull/71
-rw-r--r--CMakeLists.txt4
-rw-r--r--data/CMakeLists.txt2
-rw-r--r--data/ayatana-indicator-session.desktop.in2
-rw-r--r--data/ayatana-indicator-session.service.in2
-rw-r--r--src/CMakeLists.txt2
5 files changed, 4 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81428f2..3133c34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,10 +38,8 @@ add_definitions("-Wno-sign-compare") # Needed for GTest on Ubuntu
##
## 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}")
+include (GNUInstallDirs)
##
## Check for prerequisites
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 10616a0..9d7fd2e 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -30,7 +30,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
@@ -52,7 +51,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-session.desktop.in b/data/ayatana-indicator-session.desktop.in
index dffd22b..0309030 100644
--- a/data/ayatana-indicator-session.desktop.in
+++ b/data/ayatana-indicator-session.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Ayatana Indicator Session
-Exec=@pkglibexecdir@/ayatana-indicator-session-service
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-session/ayatana-indicator-session-service
OnlyShowIn=Unity;MATE;XFCE;Budgie:GNOME;
NoDisplay=true
StartupNotify=false
diff --git a/data/ayatana-indicator-session.service.in b/data/ayatana-indicator-session.service.in
index fccae82..3ab4654 100644
--- a/data/ayatana-indicator-session.service.in
+++ b/data/ayatana-indicator-session.service.in
@@ -4,7 +4,7 @@ PartOf=graphical-session.target
PartOf=ayatana-indicators.target
[Service]
-ExecStart=@pkglibexecdir@/ayatana-indicator-session-service
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-session/ayatana-indicator-session-service
Restart=on-failure
[Install]
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fe83084..87bc103 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,4 +23,4 @@ set_property (SOURCE main.c
LOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
add_executable (${SERVICE_EXEC} main.c)
target_link_libraries (${SERVICE_EXEC} libayatanaindicatorsessionservice backenddbus ${SERVICE_LIBRARIES})
-install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
+install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME})