Author: cazfi
Date: Sat Aug 22 11:35:12 2015
New Revision: 29636
URL: http://svn.gna.org/viewcvs/freeciv?rev=29636&view=rev
Log:
Added FREECIV_HOME_DIR definition, currently hardcoded to "~/.freeciv", to
configure,
used when constructing the default path variables.
See patch #6233
Modified:
trunk/bootstrap/fcgui.in
trunk/bootstrap/fcruledit.in
trunk/bootstrap/fcser.in
trunk/configure.ac
trunk/gen_headers/freeciv_config.h.in
trunk/utility/shared.c
Modified: trunk/bootstrap/fcgui.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/fcgui.in?rev=29636&r1=29635&r2=29636&view=diff
==============================================================================
--- trunk/bootstrap/fcgui.in (original)
+++ trunk/bootstrap/fcgui.in Sat Aug 22 11:35:12 2015
@@ -52,7 +52,7 @@
if test "x$FREECIV_DATA_PATH" = "x" ; then
if test "x$FREECIV_PATH" = "x" ; then
-
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~/.freeciv/@DATASUBDIR@"
+
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/@DATASUBDIR@"
else
FREECIV_DATA_PATH="${FREECIV_PATH}"
fi
@@ -61,19 +61,19 @@
export FREECIV_DATA_PATH
if test "x$FREECIV_PATH" = "x" ; then
-
FREECIV_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~/.freeciv@HOST_PATH_SEPARATOR@~/.freeciv/@DATASUBDIR@"
+
FREECIV_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/@DATASUBDIR@"
fi
FREECIV_PATH="${FREECIV_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@"
export FREECIV_PATH
if test "x$FREECIV_SAVE_PATH" = "x" ; then
- FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@~/.freeciv/saves"
+ FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/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/@DATASUBDIR@/scenarios@HOST_PATH_SEPARATOR@~/.freeciv/scenarios"
+
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data/scenarios@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/@DATASUBDIR@/scenarios@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/scenarios"
fi
FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data/scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data/scenarios"
export FREECIV_SCENARIO_PATH
Modified: trunk/bootstrap/fcruledit.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/fcruledit.in?rev=29636&r1=29635&r2=29636&view=diff
==============================================================================
--- trunk/bootstrap/fcruledit.in (original)
+++ trunk/bootstrap/fcruledit.in Sat Aug 22 11:35:12 2015
@@ -29,7 +29,7 @@
if test "x$FREECIV_DATA_PATH" = "x" ; then
if test "x$FREECIV_PATH" = "x" ; then
-
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~/.freeciv/@DATASUBDIR@"
+
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/@DATASUBDIR@"
else
FREECIV_DATA_PATH="${FREECIV_PATH}"
fi
@@ -38,7 +38,7 @@
export FREECIV_DATA_PATH
if test "x$FREECIV_PATH" = "x" ; then
-
FREECIV_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~/.freeciv@HOST_PATH_SEPARATOR@~/.freeciv/@DATASUBDIR@"
+
FREECIV_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/@DATASUBDIR@"
fi
FREECIV_PATH="${FREECIV_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@"
export FREECIV_PATH
Modified: trunk/bootstrap/fcser.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/fcser.in?rev=29636&r1=29635&r2=29636&view=diff
==============================================================================
--- trunk/bootstrap/fcser.in (original)
+++ trunk/bootstrap/fcser.in Sat Aug 22 11:35:12 2015
@@ -19,7 +19,7 @@
if test "x$FREECIV_DATA_PATH" = "x" ; then
if test "x$FREECIV_PATH" = "x" ; then
-
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~/.freeciv/@DATASUBDIR@"
+
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/@DATASUBDIR@"
else
FREECIV_DATA_PATH="${FREECIV_PATH}"
fi
@@ -28,19 +28,19 @@
export FREECIV_DATA_PATH
if test "x$FREECIV_PATH" = "x" ; then
-
FREECIV_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~/.freeciv@HOST_PATH_SEPARATOR@~/.freeciv/@DATASUBDIR@"
+
FREECIV_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/@DATASUBDIR@"
fi
FREECIV_PATH="${FREECIV_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@"
export FREECIV_PATH
if test "x$FREECIV_SAVE_PATH" = "x" ; then
- FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@~/.freeciv/saves"
+ FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/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/@DATASUBDIR@/scenarios@HOST_PATH_SEPARATOR@~/.freeciv/scenarios"
+
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data/scenarios@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/@DATASUBDIR@/scenarios@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/scenarios"
fi
FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data/scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data/scenarios"
export FREECIV_SCENARIO_PATH
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=29636&r1=29635&r2=29636&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Aug 22 11:35:12 2015
@@ -193,6 +193,11 @@
if test "x$MODPACK_LIST_URL" != "x" ; then
AC_DEFINE_UNQUOTED([MODPACK_LIST_URL], ["${MODPACK_LIST_URL}"], [Default
modpack list URL])
fi
+
+dnl Do not change this as some parts of freeciv still would not adjust
automatically ->
+dnl those parts would remain incompatible with the parts that do respect this.
+FREECIV_HOME_DIR="~/.freeciv"
+AC_DEFINE_UNQUOTED([FREECIV_HOME_DIR], ["$FREECIV_HOME_DIR"], [Location for
freeciv to store its information])
AC_ARG_WITH([readline],
AS_HELP_STRING([--with-readline], [support fancy command line editing]),
@@ -1071,6 +1076,7 @@
AC_SUBST([VERSION_WITHOUT_LABEL])
AC_SUBST([VERSION_LABEL])
AC_SUBST([HOST_PATH_SEPARATOR])
+AC_SUBST([FREECIV_HOME_DIR])
AM_CONDITIONAL(AUDIO_SDL, test "x$SDL_mixer" != "xno")
AM_CONDITIONAL(CLIENT_GUI_SDL, test "x$gui_sdl" = "xyes")
AM_CONDITIONAL(CLIENT_GUI_SDL2, test "x$gui_sdl2" = "xyes")
@@ -1202,21 +1208,21 @@
FC_EXPAND_DIR(FREECIV_DATADIR, "$datadir/freeciv")
if test x"$MINGW32" = xyes; then
- DEFAULT_SAVE_PATH=".;~/.freeciv/saves"
+ DEFAULT_SAVE_PATH=".;$FREECIV_HOME_DIR/saves"
if test x$crosser = xyes ; then
FC_CONF_PATH="../etc/freeciv"
-
DEFAULT_DATA_PATH=".;data;~/.freeciv/$DATASUBDIR;$datadir/freeciv;../share/freeciv"
-
DEFAULT_SCENARIO_PATH=".;data/scenarios;~/.freeciv/$DATASUBDIR/scenarios;~/.freeciv/scenarios;$datadir/freeciv/scenarios;../share/freeciv/scenarios"
+
DEFAULT_DATA_PATH=".;data;$FREECIV_HOME_DIR/$DATASUBDIR;$datadir/freeciv;../share/freeciv"
+
DEFAULT_SCENARIO_PATH=".;data/scenarios;$FREECIV_HOME_DIR/$DATASUBDIR/scenarios;~/$FREECIV_HOME_DIR/scenarios;$datadir/freeciv/scenarios;../share/freeciv/scenarios"
else
FC_CONF_PATH="etc/freeciv"
- DEFAULT_DATA_PATH=".;data;~/.freeciv/$DATASUBDIR;$datadir/freeciv"
-
DEFAULT_SCENARIO_PATH=".;data/scenarios;~/.freeciv/$DATASUBDIR/scenarios;~/.freeciv/scenarios;$datadir/freeciv/scenarios"
+ DEFAULT_DATA_PATH=".;data;$FREECIV_HOME_DIR/$DATASUBDIR;$datadir/freeciv"
+
DEFAULT_SCENARIO_PATH=".;data/scenarios;$FREECIV_HOME_DIR/$DATASUBDIR/scenarios;$FREECIV_HOME_DIR/scenarios;$datadir/freeciv/scenarios"
fi
else
FC_CONF_PATH="$sysconfdir/freeciv"
- DEFAULT_DATA_PATH=".:data:~/.freeciv/$DATASUBDIR:$datadir/freeciv"
- DEFAULT_SAVE_PATH=".:~/.freeciv/saves"
-
DEFAULT_SCENARIO_PATH=".:data/scenarios:~/.freeciv/$DATASUBDIR/scenarios:~/.freeciv/scenarios:$datadir/freeciv/scenarios"
+ DEFAULT_DATA_PATH=".:data:$FREECIV_HOME_DIR/$DATASUBDIR:$datadir/freeciv"
+ DEFAULT_SAVE_PATH=".:$FREECIV_HOME_DIR/saves"
+
DEFAULT_SCENARIO_PATH=".:data/scenarios:$FREECIV_HOME_DIR/$DATASUBDIR/scenarios:$FREECIV_HOME_DIR/scenarios:$datadir/freeciv/scenarios"
fi
CPPFLAGS="$CPPFLAGS -DFC_CONF_PATH=\"\\\"$FC_CONF_PATH\\\"\""
CPPFLAGS="$CPPFLAGS -DDEFAULT_DATA_PATH=\"\\\"$DEFAULT_DATA_PATH\\\"\""
Modified: trunk/gen_headers/freeciv_config.h.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/gen_headers/freeciv_config.h.in?rev=29636&r1=29635&r2=29636&view=diff
==============================================================================
--- trunk/gen_headers/freeciv_config.h.in (original)
+++ trunk/gen_headers/freeciv_config.h.in Sat Aug 22 11:35:12 2015
@@ -74,4 +74,7 @@
/* liblzma is available */
#undef FREECIV_HAVE_LIBLZMA
+/* Location for freeciv to store its information */
+#undef FREECIV_HOME_DIR
+
#endif /* FC__FREECIV_CONFIG_H */
Modified: trunk/utility/shared.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.c?rev=29636&r1=29635&r2=29636&view=diff
==============================================================================
--- trunk/utility/shared.c (original)
+++ trunk/utility/shared.c Sat Aug 22 11:35:12 2015
@@ -74,18 +74,18 @@
#ifndef DEFAULT_DATA_PATH
#define DEFAULT_DATA_PATH "." PATH_SEPARATOR \
"data" PATH_SEPARATOR \
- "~/.freeciv/" DATASUBDIR
+ FREECIV_HOME_DIR DATASUBDIR
#endif
#ifndef DEFAULT_SAVE_PATH
#define DEFAULT_SAVE_PATH "." PATH_SEPARATOR \
- "~/.freeciv/saves"
+ FREECIV_HOME_DIR "/saves"
#endif
#ifndef DEFAULT_SCENARIO_PATH
#define DEFAULT_SCENARIO_PATH \
"." PATH_SEPARATOR \
"data/scenarios" PATH_SEPARATOR \
- "~/.freeciv/" DATASUBDIR "/scenarios" PATH_SEPARATOR \
- "~/.freeciv/scenarios"
+ FREECIV_HOME_DIR DATASUBDIR "/scenarios" PATH_SEPARATOR \
+ FREECIV_HOME_DIR "/scenarios"
#endif /* DEFAULT_SCENARIO_PATH */
/* environment */
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
