[Freeciv-Dev] Re: [FreeCiv-Cvs] rfalke: Set the value of PATH_SEPARATOR based on a s...

[Andreas Kemnade <akemnade@xxxxxxxxxxx>]

Raimar Falke writes:
 > On Mon, Feb 04, 2002 at 04:13:21PM +0100, Andreas Kemnade wrote:
 > > Raimar Falke writes:
 > >  > On Sun, Feb 03, 2002 at 08:29:12PM +0100, Andreas Kemnade wrote:
 > >  > > freeciv@xxxxxxxxxxxxxxxxxxx writes:
 > >  > >  > This is an automated notification of a change to freeciv cvs, 
 > >  > >  > on Wed Jan 30 07:44:24 PST 2002 = Wed Jan 30 15:44:24 2002 (GMT)
 > >  > >  > by Raimar Falke <rf13@xxxxxxxxxxxxxxxxxxxxxx>
 > >  > >  > 
 > >  > >  > ---- Files affected:
 > >  > >  > 
 > >  > >  > freeciv/common shared.c
 > >  > >  > 
 > >  > >  > ---- Log message:
 > >  > >  > 
 > >  > >  > Set the value of PATH_SEPARATOR based on a sensible rule.
 > >  > >  > 
 > >  > >  > Reported by Alexander Mai <st002279@xxxxxxxxxxxxxxxxxxxxxx>.
 > >  > >  > 
 > >  > > This breaks win32 a bit. You need to set FREECIV_PATH manually now.
 > >  > > (SET FREECIV_PATH=data has to be typed into a dos box)
 > >  > > How should this be fixed?
 > >  > 
 > >  > How does it break?
 > > 
 > > in configure.in:
 > > AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, ".:data:~/.freeciv:$FREECIV_DATADIR")
 > > 
 > > So datafilename() (in common/shared.c) gets that string and searches
 > > for ';' in it. But it does not find one...
 > > So I have to set FREECIV_PATH to overwrite the default path. 
 > 
 > What doing
 > - AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, ".:data:~/.freeciv:$FREECIV_DATADIR")
 > + if win32
 > +  AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, 
 > ".;data;~/.freeciv;$FREECIV_DATADIR")
 > + else
 > +  AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, 
 > ".:data:~/.freeciv:$FREECIV_DATADIR")
 > +fi
 > in configure.in?
 > 
This seems to work:

--- /usr/src/cvs/freeciv/configure.in   Mon Feb  4 16:48:27 2002
+++ configure.in        Mon Feb  4 17:38:47 2002
@@ -547,7 +547,12 @@
 
 dnl export where the datadir is going to be installed
 FC_EXPAND_DIR(FREECIV_DATADIR, "$datadir/freeciv")
-AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, ".:data:~/.freeciv:$FREECIV_DATADIR")
+
+if test x"$MINGW32" = xyes; then
+  AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, ".;data;~/.freeciv;$FREECIV_DATADIR")
+else
+  AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, ".:data:~/.freeciv:$FREECIV_DATADIR")
+fi
 
 dnl This has to be last library
 if test -n "$WITH_EFENCE"; then

Greetings
Andreas Kemnade