diff options
| author |  Wouter van Kesteren <woutershep@gmail.com> | 2016-12-17 00:18:39 +0100 |
|---|---|---|
| committer | Wouter van Kesteren <woutershep@gmail.com> | 2016-12-17 01:00:39 +0100 |
| commit | 09b9106550fc05f71a49a3ddef7db8567c5888ac (patch) | |
| tree | 8b8c75883ff27ef31588b886f4813177bab80ab2 /sway | |
| parent | Merge pull request #991 from barfoo1/registry_fix (diff) | |
| download | sway-09b9106550fc05f71a49a3ddef7db8567c5888ac.tar.gz sway-09b9106550fc05f71a49a3ddef7db8567c5888ac.tar.zst sway-09b9106550fc05f71a49a3ddef7db8567c5888ac.zip | |
Use CMAKE_INSTALL_FULL_DATA{,ROOT}DIR
Exherbo installs architecture dependent data in a different place than architecture
independent data. More concretely: binaries go in /usr/$chost/{bin,lib},
data goes in /usr/share and configs in /etc, /etc is already configurable
through CMAKE_INSTALL_FULL_SYSCONFDIR but the datadir was not. This
patch fixes it so that things can be pushed in the right places.
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt index 4532a6c3..448335cc 100644 --- a/sway/CMakeLists.txt +++ b/sway/CMakeLists.txt | |||
| @@ -74,7 +74,7 @@ function(add_config name source destination) | |||
| 74 | add_custom_command( | 74 | add_custom_command( |
| 75 | OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name} | 75 | OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name} |
| 76 | COMMAND sed -r | 76 | COMMAND sed -r |
| 77 | 's?__PREFIX__?${CMAKE_INSTALL_PREFIX}?g\; s?__SYSCONFDIR__?${CMAKE_INSTALL_FULL_SYSCONFDIR}?g' | 77 | 's?__PREFIX__?${CMAKE_INSTALL_PREFIX}?g\; s?__SYSCONFDIR__?${CMAKE_INSTALL_FULL_SYSCONFDIR}?g\; s?__DATADIR__?${CMAKE_INSTALL_FULL_DATADIR}?g' |
| 78 | ${PROJECT_SOURCE_DIR}/${source}.in > ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name} | 78 | ${PROJECT_SOURCE_DIR}/${source}.in > ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name} |
| 79 | DEPENDS ${PROJECT_SOURCE_DIR}/${source}.in | 79 | DEPENDS ${PROJECT_SOURCE_DIR}/${source}.in |
| 80 | COMMENT "Generating config file ${source}" | 80 | COMMENT "Generating config file ${source}" |