[Freeciv-Dev] (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 >

This patch should fix it.  However it's written for the development
branch and will take a few changes to work for S2_0.

jason

? data/flags/svg
Index: configure.ac
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.ac,v
retrieving revision 1.85
diff -u -r1.85 configure.ac
--- configure.ac        22 Oct 2004 15:45:42 -0000      1.85
+++ configure.ac        27 Oct 2004 22:59:28 -0000
@@ -307,11 +307,14 @@
 dnl note this has to match the path installed by po/Makefile
 if test x"$MINGW32" != "xyes"; then
   FC_EXPAND_DIR(LOCALEDIR, "$datadir/locale")
-  AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [Locale directory])
 else
   FC_EXPAND_DIR(LOCALEDIR, './share/locale')
-  AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [Locale directory])
 fi  
+AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [Locale directory])
+
+FC_EXPAND_DIR(BINDIR, "$bindir")
+AC_DEFINE_UNQUOTED([BINDIR], ["$BINDIR"],
+                  [The location where binaries will be installed])
 
 dnl Check for zlib (needed for libpng)
 AC_CHECK_LIB(z, gzgets, , 
Index: client/connectdlg_common.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/connectdlg_common.c,v
retrieving revision 1.26
diff -u -r1.26 connectdlg_common.c
--- client/connectdlg_common.c  24 Oct 2004 23:18:07 -0000      1.26
+++ client/connectdlg_common.c  27 Oct 2004 22:59:28 -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.