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	Sun Aug 22 18:21:33 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
@@ -38,6 +37,7 @@
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY
 #undef LOCALEDIR
+#undef DEFAULT_DATA_PATH
 #undef HAVE_SIGPIPE
 #undef ALWAYS_ROOT
 #undef STRICT_WINDOWS
diff -Nur -X no.freeciv freeciv-cvs/civ freeciv-mod/civ
--- freeciv-cvs/civ	Sat May 29 05:09:10 1999
+++ freeciv-mod/civ	Sun Aug 22 17:50:43 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	Sun Aug 22 17:50:43 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	Sun Aug 22 18:27:07 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
@@ -84,6 +83,7 @@
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY
 #undef LOCALEDIR
+#undef DEFAULT_DATA_PATH
 #undef HAVE_SIGPIPE
 #undef ALWAYS_ROOT
 #undef STRICT_WINDOWS
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	Sun Aug 22 18:22:45 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
@@ -86,6 +85,7 @@
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY
 #undef LOCALEDIR
+#undef DEFAULT_DATA_PATH
 #define HAVE_SIGPIPE 1		/* ? dwp */
 
 #define ALWAYS_ROOT 1
@@ -96,7 +96,6 @@
 
 #define GENERATING_MAC
 #define HAVE_OPENTRANSPORT
-
 
 /* 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	Sun Aug 22 18:03:16 1999
@@ -6016,7 +6016,7 @@
         )`
 
 cat >> confdefs.h <<EOF
-#define FREECIV_DATADIR "$FREECIV_DATADIR"
+#define DEFAULT_DATA_PATH ".:data:~/.freeciv:$FREECIV_DATADIR"
 EOF
 
 
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	Sun Aug 22 17:55:47 1999
@@ -282,7 +282,7 @@
 
 dnl export where the datadir is going to be installed
 FC_EXPAND_DIR(FREECIV_DATADIR, "$datadir/freeciv")
-AC_DEFINE_UNQUOTED(FREECIV_DATADIR, "$FREECIV_DATADIR")
+AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, ".:data:~/.freeciv:$FREECIV_DATADIR")
 
 dnl This has to be last library
 if test -n "$WITH_EFENCE"; then
diff -Nur -X no.freeciv freeciv-cvs/ser freeciv-mod/ser
--- freeciv-cvs/ser	Sat May 29 05:09:11 1999
+++ freeciv-mod/ser	Sun Aug 22 17:50:47 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