Last-Update: 2023-12-28 Forwarded: not-needed Author: Dmitry Smirnov Description: Debianise install locations. --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,9 +117,9 @@ set(RESOURCES_PATH resources) elseif(IS_APPLE) set(RESOURCES_PATH wxlauncher.app/Contents/Resources) else() - set(RESOURCES_PATH ${CMAKE_INSTALL_PREFIX}/share/wxlauncher/) + set(RESOURCES_PATH ${CMAKE_INSTALL_PREFIX}/share/freespace2-launcher/) endif() endif() set(HELP_HTB_LOCATION ${RESOURCES_PATH}/onlinehelp.htb) endif(DEVELOPMENT_MODE) --- a/cmake/wxLauncherInstaller.cmake +++ b/cmake/wxLauncherInstaller.cmake @@ -147,9 +147,9 @@ install(DIRECTORY resources/ DESTINATION ${RESOURCES_PATH}) install(FILES ${helphtblocation} DESTINATION ${RESOURCES_PATH}) if (${CMAKE_VERSION} VERSION_EQUAL 3.0 OR ${CMAKE_VERSION} VERSION_GREATER 3.0) # Assume a freedesktop environment - set(WXLAUNCHER_FILE ${CMAKE_INSTALL_PREFIX}/bin/$) + set(WXLAUNCHER_FILE ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/$) configure_file("${PROJECT_SOURCE_DIR}/platform/freedesktop/wxLauncher.desktop.in" "${CMAKE_BINARY_DIR}/platform/freedesktop/wxlauncher.desktop") file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/platform/freedesktop/wxlauncher.desktop-$" INPUT "${CMAKE_BINARY_DIR}/platform/freedesktop/wxlauncher.desktop")