diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2012-09-10 18:30:31 +0400 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2012-09-10 18:30:31 +0400 |
| commit | cf94d68530dc5fbfb855a687687c69d56e6e1c05 (patch) | |
| tree | e02258828ba315c128007d71e74cebd2462f47cd | |
| parent | 6272aa3f9b09d459dc7100248da37a25d3eacef3 (diff) | |
Fix CONFG_PATH_HOME default value.
Prevent current directory from being listed twice on search path.
Update documentation.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | doc/examples/buildconfig | 20 |
2 files changed, 14 insertions, 8 deletions
@@ -111,7 +111,7 @@ PATH_DEFS += -DDEFGAME='"$(CONFIG_GAME_DEFAULT)"' ifndef CONFIG_WINDOWS CONFIG_PATH_DATA ?= . CONFIG_PATH_LIB ?= . - CONFIG_PATH_HOME ?= . + CONFIG_PATH_HOME ?= PATH_DEFS += -DDATADIR='"$(CONFIG_PATH_DATA)"' PATH_DEFS += -DLIBDIR='"$(CONFIG_PATH_LIB)"' PATH_DEFS += -DHOMEDIR='"$(CONFIG_PATH_HOME)"' diff --git a/doc/examples/buildconfig b/doc/examples/buildconfig index 18cb4cb..8cfc83c 100644 --- a/doc/examples/buildconfig +++ b/doc/examples/buildconfig @@ -149,24 +149,30 @@ ### System paths ### -# Set the options below if you wish to install Q2PRO system-wide. All these -# options default to "." (current directory). These options have no effect on -# Windows. +# By default Q2PRO assumes per-user installation: all game content, configs and +# executable files are kept in the same directory tree. This configuration is +# easy for most users to set up, but not ideal from security standpoint. +# +# Uncomment the options below if you wish to install Q2PRO system-wide, +# separating static, executable and writable content into different trees with +# different permissions. These options have no effect on Windows. # Path to the game data tree. This is where all static, non-executable data # lives (e.g., paks). This option sets the default value of "basedir" console -# variable. +# variable. Default value of this option is "." (current directory). #CONFIG_PATH_DATA=/usr/local/share/games/q2pro -# Path to the game libraries tree. This is where executable parts if all game +# Path to the game libraries tree. This is where executable parts of all game # mods live (e.g., game$(CPU).so files). This option sets the default value of -# "libdir" console variable. +# "libdir" console variable. Default value of this option is "." (current +# directory). #CONFIG_PATH_LIB=/usr/local/lib/games/q2pro # Name of the directory where Q2PRO stores per-user data. Tilde at the # beginning of the name is automatically expanded to user home directory at run # time. Users running Q2PRO must have write permissions to this directory. -# This option sets the default value of "homedir" console variable. +# This option sets the default value of "homedir" console variable. Default +# value of this option is "" (use basedir as homedir). #CONFIG_PATH_HOME=~/.q2pro |