[Freeciv-Dev] Re: (PR#10738) Installed freeciv-2.0.0-beta2 doesn't start or load games

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10738 >

Jason Short wrote:
> <URL: http://rt.freeciv.org/Ticket/Display.html?id=10738 >
> 
> This patch should fix it.  However it's written for the development
> branch and will take a few changes to work for S2_0.

And here is a patch for S2_0.

jason

Index: configure.ac
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.ac,v
retrieving revision 1.80.2.3
diff -u -r1.80.2.3 configure.ac
--- configure.ac        20 Oct 2004 03:45:21 -0000      1.80.2.3
+++ configure.ac        28 Oct 2004 01:21:23 -0000
@@ -260,6 +260,10 @@
 FC_EXPAND_DIR(LOCALEDIR, "$datadir/locale")
 AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [Locale directory])
 
+FC_EXPAND_DIR(BINDIR, "$bindir")
+AC_DEFINE_UNQUOTED([BINDIR], ["$BINDIR"],
+                  [The location where binaries will be installed])
+
 EXTRA_GCC_DEBUG_CFLAGS=""
 
 if test -n "$GCC"; then
Index: configure.in
===================================================================
RCS file: /home/freeciv/CVS/freeciv/Attic/configure.in,v
retrieving revision 1.256.2.3
diff -u -r1.256.2.3 configure.in
--- configure.in        20 Oct 2004 03:45:21 -0000      1.256.2.3
+++ configure.in        28 Oct 2004 01:21:23 -0000
@@ -259,6 +259,10 @@
 FC_EXPAND_DIR(LOCALEDIR, "$datadir/locale")
 AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
 
+FC_EXPAND_DIR(BINDIR, "$bindir")
+AC_DEFINE_UNQUOTED([BINDIR], ["$BINDIR"],
+                  [The location where binaries will be installed])
+
 EXTRA_GCC_DEBUG_CFLAGS=""
 
 if test -n "$GCC"; then
Index: client/connectdlg_common.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/connectdlg_common.c,v
retrieving revision 1.24.2.2
diff -u -r1.24.2.2 connectdlg_common.c
--- client/connectdlg_common.c  24 Oct 2004 23:19:51 -0000      1.24.2.2
+++ client/connectdlg_common.c  28 Oct 2004 01:21:23 -0000
@@ -257,7 +257,7 @@
     /* these won't return on success */ 
     execvp("./ser", argv);
     execvp("./server/civserver", argv);
-    execvp("civserver", argv);
+    execvp(BINDIR "/civserver", argv);
     
     /* This line is only reached if civserver cannot be started, 
      * so we kill the forked process.