diff -Nur -X no.freeciv freeciv-cvs/acconfig.h freeciv-mod/acconfig.h --- freeciv-cvs/acconfig.h Sat Aug 21 16:09:54 1999 +++ freeciv-mod/acconfig.h Sat Aug 21 17:18:50 1999 @@ -22,7 +22,6 @@ #undef PATCH_VERSION #undef IS_BETA_VERSION #undef VERSION_STRING -#undef FREECIV_DATADIR #undef HAVE_LIBICE #undef HAVE_LIBSM #undef HAVE_LIBX11 @@ -44,6 +43,7 @@ #undef GENERATING_MAC #undef HAVE_OPENTRANSPORT #undef PATH_SEPARATOR +#undef DEFAULT_DATA_PATH @BOTTOM@ diff -Nur -X no.freeciv freeciv-cvs/civ freeciv-mod/civ --- freeciv-cvs/civ Sat May 29 05:09:10 1999 +++ freeciv-mod/civ Sat Aug 21 16:39:56 1999 @@ -15,10 +15,6 @@ #***********************************************************************/ DIR=`dirname $0` -#if [ "$FREECIV_DATADIR" = "" ] ; then -# FREECIV_DATADIR=$DIR/data; export FREECIV_DATADIR -#fi - [ -x $DIR/client/civclient ] && EXE=$DIR/client/civclient [ -x $DIR/civclient ] && EXE=$DIR/civclient Binary files freeciv-cvs/client/civclient.new and freeciv-mod/client/civclient.new differ diff -Nur -X no.freeciv freeciv-cvs/common/shared.c freeciv-mod/common/shared.c --- freeciv-cvs/common/shared.c Sat Aug 21 13:15:06 1999 +++ freeciv-mod/common/shared.c Sat Aug 21 17:22:24 1999 @@ -52,12 +52,10 @@ #define PATH_SEPARATOR ":" #endif -#define BASE_DATA_PATH "." PATH_SEPARATOR "data" PATH_SEPARATOR "~/.freeciv" - -#ifdef FREECIV_DATADIR /* the configured installation directory */ -#define DEFAULT_DATA_PATH BASE_DATA_PATH PATH_SEPARATOR FREECIV_DATADIR -#else -#define DEFAULT_DATA_PATH BASE_DATA_PATH +/* If no default data path is defined use the default default one */ +#ifndef DEFAULT_DATA_PATH +#define DEFAULT_DATA_PATH "." PATH_SEPARATOR "data" PATH_SEPARATOR \ + "~/.freeciv" #endif /* Random Number Generator variables */ @@ -542,9 +540,8 @@ Returns a filename to access the specified file from a data directory; The file may be in any of the directories in the data path, which is specified internally or may be set as the environment variable - $FREECIV_PATH. (A colon-separated list of directories.) - (For backward compatability the directory specified by $FREECIV_DATADIR - (if any) is prepended to this path. (Is this desirable?)) + $FREECIV_PATH. (A separated list of directories, where the separator + itself can specified internally.) '~' at the start of a component (provided followed by '/' or '\0') is expanded as $HOME. @@ -569,17 +566,10 @@ if (!init) { char *tok; char *path = getenv("FREECIV_PATH"); - char *data = getenv("FREECIV_DATADIR"); if (!path) { path = DEFAULT_DATA_PATH; } - if (data) { - char *tmp = fc_malloc(strlen(data) + strlen(path) + 2); - sprintf(tmp, "%s" PATH_SEPARATOR "%s", data, path); - path = tmp; - } else { - path = mystrdup(path); /* something we can strtok */ - } + path = mystrdup(path); /* something we can strtok */ tok = strtok(path, PATH_SEPARATOR); do { diff -Nur -X no.freeciv freeciv-cvs/config.h.in freeciv-mod/config.h.in --- freeciv-cvs/config.h.in Sat Aug 21 13:14:02 1999 +++ freeciv-mod/config.h.in Sat Aug 21 17:19:08 1999 @@ -68,7 +68,6 @@ #undef PATCH_VERSION #undef IS_BETA_VERSION #undef VERSION_STRING -#undef FREECIV_DATADIR #undef HAVE_LIBICE #undef HAVE_LIBSM #undef HAVE_LIBX11 @@ -90,6 +89,7 @@ #undef GENERATING_MAC #undef HAVE_OPENTRANSPORT #undef PATH_SEPARATOR +#undef DEFAULT_DATA_PATH /* Define if you have the __argz_count function. */ #undef HAVE___ARGZ_COUNT diff -Nur -X no.freeciv freeciv-cvs/config.mac.h freeciv-mod/config.mac.h --- freeciv-cvs/config.mac.h Sat Aug 21 13:14:02 1999 +++ freeciv-mod/config.mac.h Sat Aug 21 17:19:33 1999 @@ -70,7 +70,6 @@ #undef PATCH_VERSION #undef IS_BETA_VERSION #undef VERSION_STRING -#undef FREECIV_DATADIR #undef HAVE_LIBICE #undef HAVE_LIBSM #undef HAVE_LIBX11 @@ -96,7 +95,7 @@ #define GENERATING_MAC #define HAVE_OPENTRANSPORT - +#undef DEFAULT_DATA_PATH /* Define if you have the __argz_count function. */ #undef HAVE___ARGZ_COUNT diff -Nur -X no.freeciv freeciv-cvs/configure freeciv-mod/configure --- freeciv-cvs/configure Sat Aug 21 13:14:09 1999 +++ freeciv-mod/configure Sat Aug 21 16:55:48 1999 @@ -6007,22 +6007,9 @@ fi rm -f conftest* - - FREECIV_DATADIR="$datadir/freeciv" - FREECIV_DATADIR=`( - test "x$prefix" = xNONE && prefix="$ac_default_prefix" - test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" - eval echo \""$FREECIV_DATADIR"\" - )` - -cat >> confdefs.h <&6 -echo "configure:6026: checking for malloc in -lefence" >&5 +echo "configure:6013: checking for malloc in -lefence" >&5 ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6030,7 +6017,7 @@ ac_save_LIBS="$LIBS" LIBS="-lefence $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff -Nur -X no.freeciv freeciv-cvs/configure.in freeciv-mod/configure.in --- freeciv-cvs/configure.in Sat Aug 21 13:14:10 1999 +++ freeciv-mod/configure.in Sat Aug 21 16:11:53 1999 @@ -280,10 +280,6 @@ AC_DEFINE(HAVE_SIGPIPE)], [AC_MSG_RESULT([no])]) -dnl export where the datadir is going to be installed -FC_EXPAND_DIR(FREECIV_DATADIR, "$datadir/freeciv") -AC_DEFINE_UNQUOTED(FREECIV_DATADIR, "$FREECIV_DATADIR") - dnl This has to be last library if test -n "$WITH_EFENCE"; then AC_CHECK_LIB(efence, malloc, [ diff -Nur -X no.freeciv freeciv-cvs/ser freeciv-mod/ser --- freeciv-cvs/ser Sat May 29 05:09:11 1999 +++ freeciv-mod/ser Sat Aug 21 16:39:26 1999 @@ -15,10 +15,6 @@ #***********************************************************************/ DIR=`dirname $0` -#if [ "$FREECIV_DATADIR" = "" ] ; then -# FREECIV_DATADIR=$DIR/data; export FREECIV_DATADIR -#fi - [ -x $DIR/server/civserver ] && EXE=$DIR/server/civserver [ -x $DIR/civserver ] && EXE=$DIR/civserver