<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40247 >
2008/5/22 Marko Lindqvist:
>
> Attached patch makes civ & ser scripts to work in mingw32.
This version applies cleanly to trunk (previous one is for S2_2)
- ML
diff -Nurd -X.diff_ignore freeciv/bootstrap/civ.in freeciv/bootstrap/civ.in
--- freeciv/bootstrap/civ.in 2008-04-17 01:27:03.000000000 +0300
+++ freeciv/bootstrap/civ.in 2008-06-04 23:32:09.000000000 +0300
@@ -18,12 +18,12 @@
[EMAIL PROTECTED]@
if [ "x$FREECIV_PATH" = "x" ] ; then
- FREECIV_PATH=".:data:~/.freeciv"
+ FREECIV_PATH="[EMAIL PROTECTED]@[EMAIL PROTECTED]@~/.freeciv"
fi
-export FREECIV_PATH="$FREECIV_PATH:@abs_top_builddir@/data:@abs_top_srcdir@/data"
+export FREECIV_PATH="[EMAIL PROTECTED]@@abs_top_builddir@/[EMAIL PROTECTED]@@abs_top_srcdir@/data"
-[ -x $BUILDDIR/client/civclient ] && EXE=$BUILDDIR/client/$EXENAME
-[ -x $BUILDDIR/civclient ] && EXE=$BUILDDIR/$EXENAME
+[ -x $BUILDDIR/client/$EXENAME ] && EXE=$BUILDDIR/client/$EXENAME
+[ -x $BUILDDIR/$EXENAME ] && EXE=$BUILDDIR/$EXENAME
if [ "$EXE" = "" ]; then
echo $0: Unable to find $EXENAME.
diff -Nurd -X.diff_ignore freeciv/bootstrap/ser.in freeciv/bootstrap/ser.in
--- freeciv/bootstrap/ser.in 2008-04-17 01:27:03.000000000 +0300
+++ freeciv/bootstrap/ser.in 2008-06-04 23:32:58.000000000 +0300
@@ -18,12 +18,12 @@
[EMAIL PROTECTED]@
if [ "x$FREECIV_PATH" = "x" ] ; then
- FREECIV_PATH=".:data:~/.freeciv"
+ FREECIV_PATH="[EMAIL PROTECTED]@[EMAIL PROTECTED]@~/.freeciv"
fi
-export FREECIV_PATH="$FREECIV_PATH:@abs_top_builddir@/data:@abs_top_srcdir@/data"
+export FREECIV_PATH="[EMAIL PROTECTED]@@abs_top_builddir@/[EMAIL PROTECTED]@@abs_top_srcdir@/data"
-[ -x $BUILDDIR/server/civserver ] && EXE=$BUILDDIR/server/$EXENAME
-[ -x $BUILDDIR/civserver ] && EXE=$BUILDDIR/$EXENAME
+[ -x $BUILDDIR/server/$EXENAME ] && EXE=$BUILDDIR/server/$EXENAME
+[ -x $BUILDDIR/$EXENAME ] && EXE=$BUILDDIR/$EXENAME
if [ "$EXE" = "" ]; then
echo $0: Unable to find $EXENAME.
diff -Nurd -X.diff_ignore freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac 2008-05-04 16:48:09.000000000 +0300
+++ freeciv/configure.ac 2008-06-04 23:28:50.000000000 +0300
@@ -373,6 +373,7 @@
dnl Defaults
MINGW32=no
AMIGA=no
+HOST_PATH_SEPARATOR=":"
dnl Settings specific to host OS
case "$host_os" in
@@ -385,6 +386,8 @@
AC_MSG_ERROR([*** 'windres' missing. Install binutils, fix your \$PATH, or set \$WINDRES manually. ***])
fi
+ HOST_PATH_SEPARATOR=";"
+
AC_DEFINE([SOCKET_ZERO_ISNT_STDIN], [1], [Mingw32-specific setting - stdin])
AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - Mingw32])
AC_DEFINE([WIN32_NATIVE], [1], [Mingw32-specific setting - native])
@@ -405,6 +408,12 @@
esac
+dnl Autoconf provides path separator for build system.
+dnl Use that instead of our own guess in case of native build.
+if test x$build = x$host ; then
+ HOST_PATH_SEPARATOR=$PATH_SEPARATOR
+fi
+
dnl note this has to match the path installed by po/Makefile
if test x"$MINGW32" != "xyes"; then
CPPFLAGS="$CPPFLAGS -DLOCALEDIR=\"\\\"$localedir\\\"\""
@@ -534,6 +543,7 @@
AC_SUBST(FTWL_CFLAGS)
AC_SUBST([VERSION_WITHOUT_LABEL])
AC_SUBST([VERSION_LABEL])
+AC_SUBST([HOST_PATH_SEPARATOR])
AM_CONDITIONAL(AUDIO_SDL, test "x$SDL_mixer" = "xyes")
AM_CONDITIONAL(CLIENT_GUI_SDL, test "$gui_sources" = "gui-sdl")
AM_CONDITIONAL(CLIENT_GUI_GTK_2_0, test "$gui_sources" = "gui-gtk-2.0")
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
