No More /opt

This commit is contained in:
TheBrokenRail 2021-12-17 19:07:58 -05:00
parent 5a5fe4c731
commit ea49470450
5 changed files with 3 additions and 3 deletions

View File

@ -44,7 +44,7 @@ else()
endif() endif()
# Specify Installation Paths # Specify Installation Paths
set(MCPI_INSTALL_DIR "opt/${MCPI_VARIANT_NAME}") set(MCPI_INSTALL_DIR "lib/${MCPI_VARIANT_NAME}")
set(MCPI_LIB_DIR "${MCPI_INSTALL_DIR}/lib") set(MCPI_LIB_DIR "${MCPI_INSTALL_DIR}/lib")
set(MCPI_FALLBACK_LIB_DIR "${MCPI_INSTALL_DIR}/fallback-lib") set(MCPI_FALLBACK_LIB_DIR "${MCPI_INSTALL_DIR}/fallback-lib")
@ -69,7 +69,7 @@ endif()
# Specify Default Installation Prefix # Specify Default Installation Prefix
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "/" CACHE PATH "" FORCE) set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "" FORCE)
endif() endif()
# Use LLD When Using Clang # Use LLD When Using Clang

View File

@ -11,7 +11,7 @@ if(BUILD_NATIVE_COMPONENTS)
target_link_libraries(launcher reborn-headers) target_link_libraries(launcher reborn-headers)
# Install # Install
install(TARGETS launcher DESTINATION "${MCPI_INSTALL_DIR}") install(TARGETS launcher DESTINATION "${MCPI_INSTALL_DIR}")
install_symlink("../../${MCPI_INSTALL_DIR}/launcher" "usr/bin/${MCPI_VARIANT_NAME}") install_symlink("../../${MCPI_INSTALL_DIR}/launcher" "bin/${MCPI_VARIANT_NAME}")
if(NOT MCPI_SERVER_MODE) if(NOT MCPI_SERVER_MODE)
install(DIRECTORY "client-data/" DESTINATION ".") install(DIRECTORY "client-data/" DESTINATION ".")
endif() endif()

View File

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB