Author: cazfi
Date: Thu May 5 17:09:30 2016
New Revision: 32589
URL: http://svn.gna.org/viewcvs/freeciv?rev=32589&view=rev
Log:
Set paths in fcser/fcgui/fcruledit with correct dir separator
See patch #7175
Modified:
trunk/bootstrap/fcgui.in
trunk/bootstrap/fcruledit.in
trunk/bootstrap/fcser.in
Modified: trunk/bootstrap/fcgui.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/fcgui.in?rev=32589&r1=32588&r2=32589&view=diff
==============================================================================
--- trunk/bootstrap/fcgui.in (original)
+++ trunk/bootstrap/fcgui.in Thu May 5 17:09:30 2016
@@ -1,5 +1,5 @@
#!/bin/sh
-#/**********************************************************************
+#/***********************************************************************
# Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
# script by Rene Schalburg
# This program is free software; you can redistribute it and/or modify
@@ -51,21 +51,21 @@
fi
if test "x$FREECIV_DATA_PATH" = "x" ; then
-
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/@DATASUBDIR@"
+
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@@DATASUBDIR@"
fi
-FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data"
+FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_DIR_SEPARATOR@data@HOST_PATH_SEPARATOR@@abs_top_srcdir@@HOST_DIR_SEPARATOR@data"
export FREECIV_DATA_PATH
if test "x$FREECIV_SAVE_PATH" = "x" ; then
- FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/saves"
+
FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@saves"
fi
FREECIV_SAVE_PATH="${FREECIV_SAVE_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_PATH_SEPARATOR@@abs_top_srcdir@"
export FREECIV_SAVE_PATH
if test "x$FREECIV_SCENARIO_PATH" = "x" ; then
-
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data/scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/@DATASUBDIR@/scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/scenarios"
+
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@@DATASUBDIR@@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@scenarios"
fi
-FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data/scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data/scenarios"
+FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_DIR_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@@HOST_DIR_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios"
export FREECIV_SCENARIO_PATH
echo "Running $EXE"
Modified: trunk/bootstrap/fcruledit.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/fcruledit.in?rev=32589&r1=32588&r2=32589&view=diff
==============================================================================
--- trunk/bootstrap/fcruledit.in (original)
+++ trunk/bootstrap/fcruledit.in Thu May 5 17:09:30 2016
@@ -1,5 +1,5 @@
#!/bin/sh
-#/**********************************************************************
+#/***********************************************************************
# Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
# script by Rene Schalburg
# This program is free software; you can redistribute it and/or modify
@@ -28,9 +28,9 @@
fi
if test "x$FREECIV_DATA_PATH" = "x" ; then
-
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/@DATASUBDIR@"
+
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@@DATASUBDIR@"
fi
-FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data"
+FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_DIR_SEPARATOR@data@HOST_PATH_SEPARATOR@@abs_top_srcdir@@HOST_DIR_SEPARATOR@data"
export FREECIV_DATA_PATH
echo "Running $EXE"
Modified: trunk/bootstrap/fcser.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/fcser.in?rev=32589&r1=32588&r2=32589&view=diff
==============================================================================
--- trunk/bootstrap/fcser.in (original)
+++ trunk/bootstrap/fcser.in Thu May 5 17:09:30 2016
@@ -1,5 +1,5 @@
#!/bin/sh
-#/**********************************************************************
+#/***********************************************************************
# Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
# script by Rene Schalburg
# This program is free software; you can redistribute it and/or modify
@@ -18,21 +18,21 @@
EXENAME=freeciv-server@EXEEXT@
if test "x$FREECIV_DATA_PATH" = "x" ; then
-
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/@DATASUBDIR@"
+
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@@DATASUBDIR@"
fi
-FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data"
+FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_DIR_SEPARATOR@data@HOST_PATH_SEPARATOR@@abs_top_srcdir@@HOST_DIR_SEPARATOR@data"
export FREECIV_DATA_PATH
if test "x$FREECIV_SAVE_PATH" = "x" ; then
- FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/saves"
+
FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@saves"
fi
FREECIV_SAVE_PATH="${FREECIV_SAVE_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_PATH_SEPARATOR@@abs_top_srcdir@"
export FREECIV_SAVE_PATH
if test "x$FREECIV_SCENARIO_PATH" = "x" ; then
-
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data/scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/@DATASUBDIR@/scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/scenarios"
+
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@@DATASUBDIR@@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@scenarios"
fi
-FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data/scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data/scenarios"
+FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_DIR_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@@HOST_DIR_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios"
export FREECIV_SCENARIO_PATH
[ -x $BUILDDIR/server/$EXENAME ] && EXE=$BUILDDIR/server/$EXENAME
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
