--- config/crosssite.def.orig	Thu Apr 16 04:07:49 1998
+++ config/crosssite.def	Fri May  8 14:51:14 1998
@@ -36,10 +36,8 @@
  * (mwedel@pyramid.com)
  */
 
-/*
 #define XPM_PIX
-#define Xpm_LibDir /usr/local/lib/
-*/
+#define Xpm_LibDir !!X11BASE!!/lib/
 /* If your include files are someplace odd */
 /*#define Xpm_Include	/usr/local/include*/
 
@@ -51,13 +49,13 @@
  * This is a top root directory of all game staff as in UNIX-style
  * overall. 
  */
-#define CTop /home/hugin/a/crossfire/crossfire
+#define CTop !!LOCALBASE!!/lib/crossfire
 /* #define CTop /net/contrib/crossfire */
 /*#define CTop /usr/local/games/crossfire*/
 
 /* Binaries location If this is undefined, it default to the
    standard location for X binaries on your machine. */
-#define CBinDir Concat(CTop,/bin)
+#define CBinDir !!LOCALBASE!!/bin
 
 /* Libraries location If this is undefined it defaults to the
   standard location for X lib files/crossfire on your machine */
@@ -76,7 +74,8 @@
 /* Crossfire manual location If this is undefined it defaults to the
    standard location for manual pages on your machine.*/
 /* #define CManPath Concat(CTop,/man) */
-#define CManSuffix 6
+#define CManPath !!LOCALBASE!!/man
+/* #define CManSuffix 6 */
 
 
 /* Force CC to use the specified options instead of the default
@@ -85,7 +84,7 @@
  * any of the default compiler options for your machine.
  */
 /*define ForceCCOPTIONS -O -g -Wall */
-#undef ForceCCOPTIONS
+#define ForceCCOPTIONS -pipe -O
 
 /* Extra_Flags are added onto the compilers default options.  Can be
  * quite useful if you just want to add another flag or two, and not
@@ -102,9 +101,8 @@
 /* Add any extra/special libraries that you may need.  Make sure you 
  * use the -l form or put in the complete path name.
  */
-/*
-#define Extra_Libraries -lcrypt
-*/
+
+#define Extra_Libraries -lcrypt -lcompat
 
 /* Force CC to be a specific compilator? Define this to be the
  * actual compiler (see example).  If defined, the default
@@ -160,11 +158,9 @@
  * too distant future, it probably isn't worth fixing here.
  */
 
-/*
 #define Rplay_Sound
-#define RPlayLibDir /usr/local/lib
-#define RPlayIncDir /usr/local/include
-*/
+#define RPlayLibDir !!LOCALBASE!!/lib
+#define RPlayIncDir !!LOCALBASE!!/include
 
 /* define this if using OpenWindows as your enviroment. This only
  * needs to be set if the openwindows server you use is
@@ -202,7 +198,7 @@
  * awk on most other systems will be OK.
  */
 
-AWK = gawk
+AWK = awk
 
 /* Use debugged malloc?  I don't know if this exists on all machines/OS's,
  * but it does exist on SunOs 4.1.1.