diff options
| author | Robert Tari <robert@tari.in> | 2021-08-04 22:46:47 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-05 08:02:44 +0200 |
| commit | a1c03e0a0f2e862f57f2f733067f2c0927568b98 (patch) | |
| tree | 2be6cd352faf71d9af95e9ce4b1c6319df6e88cb | |
| parent | ca5dc697b17b4cb724dc5b82fa8410621a74a11a (diff) | |
| download | ayatana-indicator-sound-a1c03e0a0f2e862f57f2f733067f2c0927568b98.tar.gz ayatana-indicator-sound-a1c03e0a0f2e862f57f2f733067f2c0927568b98.tar.bz2 ayatana-indicator-sound-a1c03e0a0f2e862f57f2f733067f2c0927568b98.zip | |
Use CMAKE_INSTALL_FULL_*DIR locations for installation
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4905022..49c193f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ include(UseVala) option (enable_tests "Build the package's automatic tests." ON) set(GETTEXT_PACKAGE "ayatana-indicator-sound") -set(LOCALEDIR "${CMAKE_INSTALL_FULL_DATADIR}/locale") +set(LOCALEDIR "${CMAKE_INSTALL_FULL_LOCALEDIR}") add_definitions( -DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" ) set(SOURCE_DIR "${CMAKE_SOURCE_DIR}/src") diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 2a1549b..e9ed905 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -7,7 +7,7 @@ find_package(GSettings) set( INDICATOR_DIR - "${CMAKE_INSTALL_DATADIR}/ayatana/indicators" + "${CMAKE_INSTALL_FULL_DATADIR}/ayatana/indicators" CACHE FILEPATH "Ayatana Indicators Directory" ) @@ -75,10 +75,10 @@ endif() ######################################### -set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1") -set(POLKIT_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1") -set(DBUS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces") -set(ACCOUNTS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/accountsservice/interfaces") +set(POLKIT_LIB_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/polkit-1") +set(POLKIT_DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}/polkit-1") +set(DBUS_IFACE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/interfaces") +set(ACCOUNTS_IFACE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/accountsservice/interfaces") install(FILES org.ayatana.indicator.sound.AccountsService.xml DESTINATION "${DBUS_IFACE_DIR}" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 60eb961..fb6e422 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -338,7 +338,7 @@ target_link_libraries( install( TARGETS indicator-sound-service-bin - RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/ayatana-indicator-sound/ + RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR}/ayatana-indicator-sound/ ) if(UNITY_API_FOUND) |