| 1 |
Last-Update: 2023-12-28 |
| 2 |
Forwarded: not-needed |
| 3 |
Author: Dmitry Smirnov <[email protected]> |
| 4 |
Description: Debianise install locations. |
| 5 |
|
| 6 |
--- a/CMakeLists.txt |
| 7 |
+++ b/CMakeLists.txt |
| 8 |
@@ -117,9 +117,9 @@ |
| 9 |
set(RESOURCES_PATH resources) |
| 10 |
elseif(IS_APPLE) |
| 11 |
set(RESOURCES_PATH wxlauncher.app/Contents/Resources) |
| 12 |
else() |
| 13 |
- set(RESOURCES_PATH ${CMAKE_INSTALL_PREFIX}/share/wxlauncher/) |
| 14 |
+ set(RESOURCES_PATH ${CMAKE_INSTALL_PREFIX}/share/freespace2-launcher/) |
| 15 |
endif() |
| 16 |
endif() |
| 17 |
set(HELP_HTB_LOCATION ${RESOURCES_PATH}/onlinehelp.htb) |
| 18 |
endif(DEVELOPMENT_MODE) |
| 19 |
--- a/cmake/wxLauncherInstaller.cmake |
| 20 |
+++ b/cmake/wxLauncherInstaller.cmake |
| 21 |
@@ -147,9 +147,9 @@ |
| 22 |
install(DIRECTORY resources/ DESTINATION ${RESOURCES_PATH}) |
| 23 |
install(FILES ${helphtblocation} DESTINATION ${RESOURCES_PATH}) |
| 24 |
if (${CMAKE_VERSION} VERSION_EQUAL 3.0 OR ${CMAKE_VERSION} VERSION_GREATER 3.0) |
| 25 |
# Assume a freedesktop environment |
| 26 |
- set(WXLAUNCHER_FILE ${CMAKE_INSTALL_PREFIX}/bin/$<TARGET_FILE_NAME:wxlauncher>) |
| 27 |
+ set(WXLAUNCHER_FILE ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/$<TARGET_FILE_NAME:wxlauncher>) |
| 28 |
configure_file("${PROJECT_SOURCE_DIR}/platform/freedesktop/wxLauncher.desktop.in" "${CMAKE_BINARY_DIR}/platform/freedesktop/wxlauncher.desktop") |
| 29 |
|
| 30 |
file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/platform/freedesktop/wxlauncher.desktop-$<CONFIG>" |
| 31 |
INPUT "${CMAKE_BINARY_DIR}/platform/freedesktop/wxlauncher.desktop") |