--- Imakefile.orig	Thu Nov 21 19:28:46 1996
+++ Imakefile	Sun Jun 20 18:39:19 1999
@@ -24,23 +24,28 @@
 XCOMM This is the directory where the highscore, level & sound data will be 
 XCOMM placed. Default will be the current directory.
 
-    XBOING_DIR = .
+    XBOING_DIR = ${X11BASE}/lib/X11/xboing
 
 XCOMM These are some defines that must be set. Some may be overwritten in the
 XCOMM machine arch section.
 
-    XPMLIB 				= -L/usr/X11/lib -lXpm
-    XPMINCLUDE 			= -I/usr/X11/include/X11
+    XPMLIB 				= -lXpm
+    XPMINCLUDE 			= -I${X11BASE}/include/X11
     XBOINGINCLUDE 		= -I./include
     LEVEL_INSTALL_DIR 	= $(XBOING_DIR)/levels
     SOUNDS_DIR 			= $(XBOING_DIR)/sounds
     BACKUP_DIR 			= $(XBOING_DIR)/../backups
     HIGH_SCORE_FILE 	= $(XBOING_DIR)/.xboing.scr
+#ifdef WITHOUT_AUDIO
     AUDIO_AVAILABLE 	= False
     AUDIO_SRC 			= audio/NOaudio.c
+#else
+    AUDIO_AVAILABLE 	= True
+    AUDIO_SRC 			= audio/LINUXaudio.c
+#endif 
     AUDIO_INCLUDE 		=
     AUDIO_LIB 			=
-	CDEBUGFLAGS         = -g
+    CDEBUGFLAGS			= -O2 -pipe
 
 XCOMM Uncomment this if you want to use ANY of the AUDIO sound systems
 #define COMPILE_IN_AUDIO    
@@ -132,8 +137,8 @@
         -DLEVEL_INSTALL_DIR=\"$(LEVEL_INSTALL_DIR)\" \
         -DAUDIO_AVAILABLE=\"$(AUDIO_AVAILABLE)\" \
         -DSOUNDS_DIR=\"$(SOUNDS_DIR)\" \
-        -DREADMEP_FILE=\"$(XBOING_DIR)/docs/problems.doc\"
-XCOMM   -DUSE_FLOCK=\"True\" \
+        -DREADMEP_FILE=\"$(XBOING_DIR)/problems.doc\" \
+        -DUSE_FLOCK=\"True\"
 XCOMM   -DNEED_USLEEP=\"True\" \
 XCOMM   -DNO_LOCKING=\"True\"