From: Ron Koenderink <rkoenderink@yahoo.ca>
Date: Sat, 9 Feb 2008 14:03:56 +0000 (-0600)
Subject: Update nightly build for recent changes to path.c.in
X-Git-Tag: v4.3.12~182
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=acd768e5e2e62072dba5311637aef427b2eb6438

Update nightly build for recent changes to path.c.in

The three previous commits touching path.c.in broke mingw.patch: the
relative vs absolute paths changes moved the initializers to be
patched to new variables, and the telfil removal messed up the
context.
---

diff --git a/src/scripts/nightly/patches/win32.i386/mingw.patch b/src/scripts/nightly/patches/win32.i386/mingw.patch
index dc87f3015..16530f74b 100644
--- a/src/scripts/nightly/patches/win32.i386/mingw.patch
+++ b/src/scripts/nightly/patches/win32.i386/mingw.patch
@@ -1,10 +1,7 @@
-Index: empserver/src/lib/global/path.c.in
-===================================================================
-RCS file: /cvsroot/empserver/empserver/src/lib/global/path.c.in,v
-retrieving revision 1.19
-diff -u -p -r1.19 path.c.in
---- empserver/src/lib/global/path.c.in	3 Aug 2007 04:44:54 -0000	1.19
-+++ empserver/src/lib/global/path.c.in	16 Dec 2007 20:11:51 -0000
+diff --git a/src/lib/global/path.c.in b/src/lib/global/path.c.in
+index a761735..77b9c50 100644
+--- a/src/lib/global/path.c.in
++++ b/src/lib/global/path.c.in
 @@ -38,7 +38,7 @@
  #include "optlist.h"
  
@@ -14,22 +11,24 @@ diff -u -p -r1.19 path.c.in
  
  /*
   * Where to find configuration (absolute file name)
-@@ -53,15 +53,15 @@ char *custom_tables = "";
+@@ -53,17 +53,17 @@ char *custom_tables = "";
  char *schedulefil;
  
  /* Where to find built-in configuration tables (relative to configdir) */
--char *builtindir = "@builtindir@";
-+char *builtindir = "c:/MinGW@builtindir@";
+-char *builtindir_conf = "@builtindir@";
++char *builtindir_conf = "c:/MinGW@builtindir@";
+ /* Where to find built-in configuration tables (absolute) */
+ char *builtindir;
  
- /* Where to find info pages (relative to gamedir) */
- /* TODO UI wart, make it relative to configdir */
--char *infodir	= "@einfodir@";
-+char *infodir	= "c:/MinGW@einfodir@";
+ /* Where to find info pages (relative to configdir) */
+-char *infodir_conf = "@einfodir@";
++char *infodir_conf = "c:/MinGW@einfodir@";
+ /* Where to find info pages (absolute) */
+ char *infodir;
  
  /* Where this game's data is stored (relative to configdir) */
- /* FIXME relative broken in utility programs */
--char *gamedir	= "@gamedir@";
-+char *gamedir	= "c:/MinGW@gamedir@";
+-char *gamedir_conf = "@gamedir@";
++char *gamedir_conf = "c:/MinGW@gamedir@";
+ /* Where this game's data is stored (absolute) */
+ char *gamedir;
  
- /* These are relative to gamedir: */
- char teldir[]	= "tel";