aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-10 21:56:24 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-10 21:56:24 +0200
commit95a9f27ded2d367c7af4944172405fa5c47a9eae (patch)
tree9deb1f4d9a8c445502471a55e7084c457b065c70 /data
parent71205eed40a661280eaffbd8e7f5679b1e634a76 (diff)
parentd4cf711a5405e217f933dc170d75e6118c287fff (diff)
downloadayatana-indicator-application-95a9f27ded2d367c7af4944172405fa5c47a9eae.tar.gz
ayatana-indicator-application-95a9f27ded2d367c7af4944172405fa5c47a9eae.tar.bz2
ayatana-indicator-application-95a9f27ded2d367c7af4944172405fa5c47a9eae.zip
Merge branch 'tari01-pr/cmake-install-full'
Attributes GH PR #13: https://github.com/AyatanaIndicators/ayatana-indicator-application/pull/13
Diffstat (limited to 'data')
-rw-r--r--data/CMakeLists.txt4
-rw-r--r--data/ayatana-indicator-application.desktop.in2
-rw-r--r--data/ayatana-indicator-application.service.in2
3 files changed, 4 insertions, 4 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 123c63e..4376a49 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -4,7 +4,7 @@ pkg_check_modules(SYSTEMD systemd)
if (${SYSTEMD_FOUND})
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator-application.service.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application.service" @ONLY)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application.service" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/systemd/user")
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application.service" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/systemd/user")
endif()
# ayatana-indicator-application.desktop
@@ -14,6 +14,6 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application.desktop
# ordering-override.keyfile
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ordering-override.keyfile" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/ayatana-indicator-application")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ordering-override.keyfile" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/ayatana-indicator-application")
diff --git a/data/ayatana-indicator-application.desktop.in b/data/ayatana-indicator-application.desktop.in
index 4fce04f..a8b5306 100644
--- a/data/ayatana-indicator-application.desktop.in
+++ b/data/ayatana-indicator-application.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Ayatana Indicator Application
-Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/ayatana-indicator-application/ayatana-indicator-application-service
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-application/ayatana-indicator-application-service
StartupNotify=false
Terminal=false
OnlyShowIn=Unity;MATE;XFCE;Budgie;
diff --git a/data/ayatana-indicator-application.service.in b/data/ayatana-indicator-application.service.in
index fb2362d..2c83ab9 100644
--- a/data/ayatana-indicator-application.service.in
+++ b/data/ayatana-indicator-application.service.in
@@ -4,7 +4,7 @@ PartOf=graphical-session.target
PartOf=ayatana-indicators.target
[Service]
-ExecStart=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/ayatana-indicator-application/ayatana-indicator-application-service
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-application/ayatana-indicator-application-service
Restart=on-failure
[Install]