diff options
| -rw-r--r-- | cmake/opentrack-hier.cmake | 6 | ||||
| -rw-r--r-- | cmake/opentrack-i18n.cmake | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cmake/opentrack-hier.cmake b/cmake/opentrack-hier.cmake index 7a0659c6..8f778bb2 100644 --- a/cmake/opentrack-hier.cmake +++ b/cmake/opentrack-hier.cmake @@ -34,9 +34,9 @@ else() set(opentrack-doc-pfx "./share/doc/opentrack")
set(opentrack-doc-src-pfx "./share/doc/opentrack/source-code")
set(opentrack-install-rpath "${CMAKE_INSTALL_PREFIX}/${opentrack-hier-pfx}")
- set(opentrack-hier-str ARCHIVE DESTINATION lib/opentrack LIBRARY DESTINATION ${opentrack-hier-pfx} RUNTIME DESTINATION bin)
- set(opentrack-i18n-pfx "./libexec/opentrack/i18n")
- set(opentrack-i18n-path "../libexec/opentrack/i18n")
+ set(opentrack-hier-str ARCHIVE DESTINATION share/opentrack LIBRARY DESTINATION ${opentrack-hier-pfx} RUNTIME DESTINATION bin)
+ set(opentrack-i18n-pfx "./share/opentrack/i18n")
+ set(opentrack-i18n-path "../share/opentrack/i18n")
endif()
function(otr_escape_string var str)
diff --git a/cmake/opentrack-i18n.cmake b/cmake/opentrack-i18n.cmake index 3dd8ac9d..e1c86a39 100644 --- a/cmake/opentrack-i18n.cmake +++ b/cmake/opentrack-i18n.cmake @@ -37,7 +37,8 @@ function(otr_i18n_for_target_directory n) endfunction() function(otr_merge_translations) - install(CODE "file(REMOVE_RECURSE \"\${CMAKE_INSTALL_PREFIX}/i18n\")") + otr_escape_string(i18n-pfx "${opentrack-i18n-pfx}") + install(CODE "file(REMOVE_RECURSE \"\${CMAKE_INSTALL_PREFIX}/${i18n-pfx}\")") get_property(variant GLOBAL PROPERTY opentrack-variant) if(NOT ".${variant}" STREQUAL ".default") |