aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2022-02-11 16:26:35 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2022-02-16 11:45:33 +0100
commitaebb056a06fcbf07df68514e4688b3ae2e5d0d73 (patch)
treea454fb1c7d4363af0576fd62c956d87ad30717a7
parentba692f8e3b90bccc345e241feb3378402ae7ef5d (diff)
downloadayatana-indicator-datetime-aebb056a06fcbf07df68514e4688b3ae2e5d0d73.tar.gz
ayatana-indicator-datetime-aebb056a06fcbf07df68514e4688b3ae2e5d0d73.tar.bz2
ayatana-indicator-datetime-aebb056a06fcbf07df68514e4688b3ae2e5d0d73.zip
Drop pkglibexecdir and use native CMake file configuration
-rw-r--r--CMakeLists.txt2
-rw-r--r--data/CMakeLists.txt2
-rw-r--r--data/ayatana-indicator-datetime.desktop.in2
-rw-r--r--data/ayatana-indicator-datetime.service.in2
-rw-r--r--src/CMakeLists.txt2
5 files changed, 3 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6daef80..6e3a998 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,8 +40,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 233bd5f..2e1cdfa 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
@@ -53,7 +52,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 XDG autostart
diff --git a/data/ayatana-indicator-datetime.desktop.in b/data/ayatana-indicator-datetime.desktop.in
index 8d0bca2..e4f4521 100644
--- a/data/ayatana-indicator-datetime.desktop.in
+++ b/data/ayatana-indicator-datetime.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Ayatana Indicator Date & Time
-Exec=@pkglibexecdir@/ayatana-indicator-datetime-service
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-datetime/ayatana-indicator-datetime-service
OnlyShowIn=MATE;Unity;XFCE;Pantheon;Budgie
NoDisplay=true
StartupNotify=false
diff --git a/data/ayatana-indicator-datetime.service.in b/data/ayatana-indicator-datetime.service.in
index da1cd54..6b7803b 100644
--- a/data/ayatana-indicator-datetime.service.in
+++ b/data/ayatana-indicator-datetime.service.in
@@ -4,7 +4,7 @@ PartOf=graphical-session.target
PartOf=ayatana-indicators.target
[Service]
-ExecStart=@pkglibexecdir@/ayatana-indicator-datetime-service
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-datetime/ayatana-indicator-datetime-service
Restart=on-failure
[Install]
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4131f22..faf4341 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -63,4 +63,4 @@ link_directories (${SERVICE_DEPS_LIBRARY_DIRS})
add_executable (${SERVICE_EXEC} main.cpp)
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}")