Changed install directories so that binary and data files show up in the expected places.

main
Jacob Sowder 1 year ago
parent 5f33bdeb99
commit dfa7bbb9a9

@ -215,7 +215,11 @@ strife, chex quest, and fan-created games like harmony, hacx and freedoom.")
(search-path (search-path
(map (cut string-append <> "/my-packages/patches") (map (cut string-append <> "/my-packages/patches")
%load-path) %load-path)
"barony-fix-double-free-bug.patch"))))) "barony-fix-double-free-bug.patch")
(search-path
(map (cut string-append <> "/my-packages/patches")
%load-path)
"barony-fix-change-install-directories")))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags

@ -0,0 +1,45 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 241d7f6f..9cd8eff8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -637,7 +637,7 @@ if (NOT APPLE AND UNIX)
if (GAME_ENABLED)
install(TARGETS barony
- RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
COMPONENT Runtime
)
endif(GAME_ENABLED)
@@ -746,7 +746,7 @@ endif(EDITOR_ENABLED)
if (NOT APPLE AND UNIX)
if (EDITOR_ENABLED)
install(TARGETS ${EDITOR_EXE_NAME}
- RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" COMPONENT Runtime
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT Runtime
)
endif()
@@ -770,11 +770,11 @@ if (NOT APPLE AND UNIX)
${CMAKE_SOURCE_DIR}/steam_appid.txt
DESTINATION "${CMAKE_INSTALL_PREFIX}"
)
- endif()
+ endif()
install(DIRECTORY
${CMAKE_SOURCE_DIR}/lang
- DESTINATION "${CMAKE_INSTALL_PREFIX}"
+ DESTINATION "${CMAKE_INSTALL_DATADIR}"
)
install(FILES
@@ -782,7 +782,7 @@ if (NOT APPLE AND UNIX)
${CMAKE_SOURCE_DIR}/playernames-female.txt
${CMAKE_SOURCE_DIR}/playernames-male.txt
#TYPE INCLUDE # If your CMAKE is stupid like mine and it complains about "install FILES given no DESTINATION!", you can tell it to shove it by uncommenting this line.
- DESTINATION "${CMAKE_INSTALL_PREFIX}"
+ DESTINATION "${CMAKE_INSTALL_DATADIR}"
)
endif()
Loading…
Cancel
Save