From b43d43392a26c396645b6ed1e4456dc2658616a7 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 19 Feb 2006 18:33:02 +0000 Subject: [PATCH] Document interpretation of relative file names. --- include/econfig-spec.h | 2 ++ src/lib/global/path.c.in | 16 ++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/econfig-spec.h b/include/econfig-spec.h index 63bbaa5c3..e00010e32 100644 --- a/include/econfig-spec.h +++ b/include/econfig-spec.h @@ -73,6 +73,8 @@ EMPCFBOTH("data", gamedir, char *, NSC_STRING, KM_INTERNAL, "Directory where this game's data is stored") EMPCFBOTH("info", infodir, char *, NSC_STRING, KM_INTERNAL, "Directory where info pages are stored, can be shared among games") +EMPCF_COMMENT("# Note: Use an absolute name here, the interpretation of a relative\n" + "# name may change.") EMPCFBOTH("builtin", builtindir, char *, NSC_STRING, KM_INTERNAL, "Directory where builtin files are stored") EMPCF_COMMENT("# Set this to your source tree's src/lib/global to run the server\n" diff --git a/src/lib/global/path.c.in b/src/lib/global/path.c.in index 33781811f..260fb7956 100644 --- a/src/lib/global/path.c.in +++ b/src/lib/global/path.c.in @@ -40,22 +40,26 @@ /* econfig file to try when user doesn't specify one */ char dflt_econfig[] = "@econfig@"; -/* Where to find configuration, which is wherever econfig is looked for */ +/* + * Where to find configuration (absolute file name) + * This is wherever econfig is actually looked for. + */ char *configdir; -/* User configuration tables to load, relative to configdir */ +/* User configuration tables to load (relative to configdir) */ char *config_tables = ""; -/* Where to find built-in configuration tables */ +/* Where to find built-in configuration tables (relative to configdir) */ char *builtindir = "@builtindir@"; -/* Where to find info pages */ +/* Where to find info pages (relative to gamedir) */ +/* TODO UI wart, make it relative to configdir */ char *infodir = "@einfodir@"; -/* Where this game's data is stored */ +/* Where this game's data is stored (relative to configdir) */ char *gamedir = "@gamedir@"; -/* relative to DATADIR */ +/* These are relative to gamedir: */ char *teldir = "tel"; char *motdfil = "motd"; char *downfil = "down"; -- 2.43.0