diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-05-13 10:41:32 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-05-13 10:43:56 +0200 |
| commit | e1a03e872427611006fffa8fe82e4a2e3ffcbbc3 (patch) | |
| tree | 94ebba8455a2ddfe5664c4c8acee91b7d561ba15 | |
| parent | 868669a497fd08524eec6d31ac483f431b95198c (diff) | |
| download | MultiMC-e1a03e872427611006fffa8fe82e4a2e3ffcbbc3.tar MultiMC-e1a03e872427611006fffa8fe82e4a2e3ffcbbc3.tar.gz MultiMC-e1a03e872427611006fffa8fe82e4a2e3ffcbbc3.tar.lz MultiMC-e1a03e872427611006fffa8fe82e4a2e3ffcbbc3.tar.xz MultiMC-e1a03e872427611006fffa8fe82e4a2e3ffcbbc3.zip | |
NOISSUE make the linux package binary name configurable and default to 'multimc'
| -rw-r--r-- | application/CMakeLists.txt | 5 | ||||
| -rwxr-xr-x | application/package/linux/multimc.desktop | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 9c1ca3cd..681287c1 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -395,14 +395,15 @@ elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-nodeps") elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-system") set(MultiMC_BINARY_DEST_DIR "usr/bin" CACHE STRING "Relative path from packaging root to the binary directory") set(MultiMC_LIBRARY_DEST_DIR "usr/lib" CACHE STRING "Relative path from packaging root to the library directory") - set(MultiMC_SHARE_DEST_DIR "usr/share/multimc5" CACHE STRING "Relative path from packaging root to the shared data directory") + set(MultiMC_SHARE_DEST_DIR "usr/share/multimc" CACHE STRING "Relative path from packaging root to the shared data directory") + set(MultiMC_APP_BINARY_NAME "multimc" CACHE STRING "Name of the MultiMC binary for the purposes of linux packaging") set(JARS_DEST_DIR "${MultiMC_SHARE_DEST_DIR}") set(BINARY_DEST_DIR ${MultiMC_BINARY_DEST_DIR}) set(LIBRARY_DEST_DIR ${MultiMC_LIBRARY_DEST_DIR}) MESSAGE(STATUS "Compiling for linux system with ${MultiMC_SHARE_DEST_DIR} and MULTIMC_LINUX_DATADIR") - set_target_properties(MultiMC PROPERTIES OUTPUT_NAME "multimc5") + set_target_properties(MultiMC PROPERTIES OUTPUT_NAME ${MultiMC_APP_BINARY_NAME}) target_compile_definitions(MultiMC PRIVATE "-DMULTIMC_JARS_LOCATION=/${MultiMC_SHARE_DEST_DIR}/jars" "-DMULTIMC_LINUX_DATADIR" ) diff --git a/application/package/linux/multimc.desktop b/application/package/linux/multimc.desktop index ad18381e..7fce5c7a 100755 --- a/application/package/linux/multimc.desktop +++ b/application/package/linux/multimc.desktop @@ -2,7 +2,7 @@ Version=1.0 Encoding=UTF-8 Name=MultiMC -GenericName=Minecraft launcher +GenericName=MultiMC Comment=Free, open source launcher and instance manager for Minecraft. Type=Application Terminal=false |