diff -Nur -X no.freeciv freeciv-cvs/acconfig.h freeciv-mod/acconfig.h
--- freeciv-cvs/acconfig.h	Fri Aug 13 22:51:13 1999
+++ freeciv-mod/acconfig.h	Tue Aug 17 13:50:34 1999
@@ -43,6 +43,7 @@
 #undef STRICT_WINDOWS
 #undef GENERATING_MAC
 #undef HAVE_OPENTRANSPORT
+#undef PATH_SEPARATOR
 
 @BOTTOM@
 
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	Fri Aug 13 22:51:21 1999
+++ freeciv-mod/common/shared.c	Tue Aug 17 13:50:09 1999
@@ -43,10 +43,15 @@
 
 #include "shared.h"
 
-#define BASE_DATA_PATH ".:data:~/.freeciv"
+/* If no path separator is defined use colon */
+#ifndef PATH_SEPARATOR
+#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 ":" FREECIV_DATADIR
+#define DEFAULT_DATA_PATH BASE_DATA_PATH PATH_SEPARATOR FREECIV_DATADIR
 #else
 #define DEFAULT_DATA_PATH BASE_DATA_PATH
 #endif
@@ -529,13 +534,13 @@
     }
     if (data) {
       char *tmp = fc_malloc(strlen(data) + strlen(path) + 2);
-      sprintf(tmp, "%s:%s", data, path);
+      sprintf(tmp, "%s" PATH_SEPARATOR "%s", data, path);
       path = tmp;
     } else {
       path = mystrdup(path);	/* something we can strtok */
     }
     
-    tok = strtok(path, ":");
+    tok = strtok(path, PATH_SEPARATOR);
     do {
       int i;			/* strlen(tok), or -1 as flag */
       
@@ -577,7 +582,7 @@
 	}
       }
 
-      tok = strtok(NULL, ":");
+      tok = strtok(NULL, PATH_SEPARATOR);
     } while(tok != NULL);
 
     free(path);
@@ -597,7 +602,7 @@
     for(i=0; i<num_dirs; i++) {
       strcat(realfile, dirs[i]);
       if(i != num_dirs-1) {
-	strcat(realfile, ":");
+	strcat(realfile, PATH_SEPARATOR);
       }
     }
     return realfile;
diff -Nur -X no.freeciv freeciv-cvs/config.h.in freeciv-mod/config.h.in
--- freeciv-cvs/config.h.in	Fri Aug 13 22:51:14 1999
+++ freeciv-mod/config.h.in	Tue Aug 17 13:50:58 1999
@@ -89,6 +89,7 @@
 #undef STRICT_WINDOWS
 #undef GENERATING_MAC
 #undef HAVE_OPENTRANSPORT
+#undef PATH_SEPARATOR
 
 /* Define if you have the __argz_count function.  */
 #undef HAVE___ARGZ_COUNT