Remove the initialization for builtindir, not required

[empserver] / src / lib / global / path.c.in

diff --git a/src/lib/global/path.c.in b/src/lib/global/path.c.in
index b1b70ebc9c2508dd95d229f27c60c795d2e499e3..a761735b523995af3f086b3122da19b461df75eb 100644 (file)
--- a/src/lib/global/path.c.in
+++ b/src/lib/global/path.c.in
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,8 +26,8 @@
  *  ---
  *
  *  @configure_input@
- *  path.c: Path initializations needed outside of the file initialization
- *          tables
+ *  path.c.in: Path initializations needed outside of the file
+ *            initialization tables
  * 
  *  Known contributors to this file:
  *     Markus Armbruster, 2005
@@ -37,20 +37,48 @@
 
 #include "optlist.h"
 
+/* econfig file to try when user doesn't specify one */
 char dflt_econfig[] = "@econfig@";
-char *infodir  = "@einfodir@";
-char *gamedir  = "@gamedir@";
-
-/* relative to DATADIR */
-char *teldir   = "tel";
-char *motdfil  = "motd";
-char *downfil  = "down";
-char *disablefil = "disable";
-char *telfil   = "tel/tel";
-char *annfil   = "ann";
-char *banfil   = "ban";
-char *authfil  = "auth";
-char *timestampfil = "timestamp";
+
+/*
+ * 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) */
+char *custom_tables = "";
+
+/* Update schedule (absolute file name) */
+char *schedulefil;
+
+/* Where to find built-in configuration tables (relative to configdir) */
+char *builtindir_conf = "@builtindir@";
+/* Where to find built-in configuration tables (absolute) */
+char *builtindir;
+
+/* Where to find info pages (relative to configdir) */
+char *infodir_conf = "@einfodir@";
+/* Where to find info pages (absolute) */
+char *infodir;
+
+/* Where this game's data is stored (relative to configdir) */
+char *gamedir_conf = "@gamedir@";
+/* Where this game's data is stored (absolute) */
+char *gamedir;
+
+/* These are relative to gamedir: */
+char teldir[]  = "tel";
+char motdfil[] = "motd";
+char downfil[] = "down";
+char annfil[]  = "ann";
 
 char *listen_addr = "";
 char *loginport = "@EMPIREPORT@";
+
+/*
+ * Emacs magic:
+ * Local Variables:
+ * mode: C
+ * End:
+ */