diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-04 12:27:51 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-04 12:27:51 +0200 |
| commit | 11a61d41e4018639a1f775b929ffaa09abf403f0 (patch) | |
| tree | ce64e947c2c36d03d6fe84a6504978fda61734b1 | |
| parent | 39a3583e587f614968e5e85049fb1d927a0e5404 (diff) | |
| parent | c37f453e6de364415e55f25cebbeb337a2b851ae (diff) | |
| download | ayatana-indicator-keyboard-11a61d41e4018639a1f775b929ffaa09abf403f0.tar.gz ayatana-indicator-keyboard-11a61d41e4018639a1f775b929ffaa09abf403f0.tar.bz2 ayatana-indicator-keyboard-11a61d41e4018639a1f775b929ffaa09abf403f0.zip | |
Merge branch 'tari01-pr/cmake-install-full'
Attributes GH PR #14: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard/pull/14
| -rw-r--r-- | data/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 1ea3bc91..c99dcdf6 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -29,7 +29,7 @@ install (FILES "${XDG_AUTOSTART_FILE}" DESTINATION "${XDG_AUTOSTART_DIR}") # Ayatana Indicators File -set (AYATANA_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/ayatana/indicators") +set (AYATANA_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATADIR}/ayatana/indicators") message (STATUS "${AYATANA_INDICATOR_DIR} is the Ayatana Indicators install dir") set (AYATANA_INDICATOR_NAME "org.ayatana.indicator.keyboard") set (AYATANA_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${AYATANA_INDICATOR_NAME}") @@ -37,6 +37,6 @@ install (FILES "${AYATANA_INDICATOR_FILE}" DESTINATION "${AYATANA_INDICATOR_DIR} # Icons -set (ICON_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/icons/hicolor") +set (ICON_DIR "${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor") message (STATUS "${ICON_DIR} is the Icon install dir") install (DIRECTORY icons/scalable DESTINATION "${ICON_DIR}" FILES_MATCHING PATTERN "*.svg") |