From 38faefa66383d826f28953ad54a9b51fd5e054a3 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sun, 27 Dec 2020 05:28:47 -0500 Subject: [PATCH] - set some install defaults for posix systems --- CMakeLists.txt | 2 +- source/core/gameconfigfile.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84c4d3e08..4e7663a32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,7 @@ function( add_pk3 PK3_NAME PK3_DIR ) if( WIN32 ) set( INSTALL_PK3_PATH . CACHE STRING "Directory where engine data will be placed during install." ) else() - set( INSTALL_PK3_PATH share/games/doom CACHE STRING "Directory where engine data will be placed during install." ) + set( INSTALL_PK3_PATH share/games/raze CACHE STRING "Directory where engine data will be placed during install." ) endif() install(FILES "${PROJECT_BINARY_DIR}/${PK3_NAME}" DESTINATION ${INSTALL_PK3_PATH} diff --git a/source/core/gameconfigfile.cpp b/source/core/gameconfigfile.cpp index 115c737be..8b41105d5 100644 --- a/source/core/gameconfigfile.cpp +++ b/source/core/gameconfigfile.cpp @@ -96,9 +96,12 @@ FGameConfigFile::FGameConfigFile () SetValueForKey ("Path", "$PROGDIR/*", true); #else SetValueForKey ("Path", "$HOME/" GAME_DIR "/*", true); - // Arch Linux likes them in /usr/share/doom - // Debian likes them in /usr/share/games/doom + // Arch Linux likes them in /usr/share/raze + // Debian likes them in /usr/share/games/raze // I assume other distributions don't do anything radically different + SetValueForKey ("Path", "/opt/raze", true); + SetValueForKey ("Path", "/usr/share/games/raze", true); + SetValueForKey ("Path", "/usr/local/share/games/raze", true); SetValueForKey ("Path", "/usr/share/games/jfduke3d", true); SetValueForKey ("Path", "/usr/local/share/games/jfduke3d", true); SetValueForKey ("Path", "/usr/share/games/eduke32", true);