--- src/Imakefile.orig	Sat Nov 25 12:55:35 1995
+++ src/Imakefile	Wed Apr 12 14:57:16 2000
@@ -22,8 +22,8 @@
 # 4.) specify, if you want sound (must copy the appropriate sound module)
 #     SOUNDOBJ should be one module of X-sound_*.o if USE_SOUND is on, else empty
 #     Note: for X-sound_SUN.o, /dev/audio must have 666 permissions */
-#define USE_SOUND	/* doesn't harm if you don't have a sound card */
-SOUNDOBJ = X-sound_SUN.o
+#undef USE_SOUND	/* doesn't harm if you don't have a sound card */
+SOUNDOBJ = 
 
 # 5.) specify, if you want the antialiased card construction set (SLOW!)
 #define USE_CARD_CONSTRUCTION
@@ -37,13 +37,15 @@
 # BINDIR and LIBDIR should be predefined by the templates
 # BINDIR = /usr/bin/X11
 # LIBDIR = /usr/lib/X11
-XPATLIBDIR = /usr/games/lib/xpat
+BINDIR = /usr/local/bin
+LIBDIR = /usr/local/lib/X11
+XPATLIBDIR = $(LIBDIR)/xpat
 APPDEFSDIR = $(LIBDIR)
-XPATMANDIR = /usr/man/man6
+XPATMANDIR = $(PREFIX)/man/man6
 
 # This is the name of the log-file, where solved games are stored:
 # an alternative path would be $(XPATLIBDIR)/xpat.log
-SCOREFILE = /var/games/xpat.log
+SCOREFILE = $(XPATLIBDIR)/xpat.log
 
 
 # paths for installation in user's home-directory.
@@ -53,7 +55,9 @@
 
 # xpat2 needs to know where the xpm library resides (if needed)
 XPMLIB 			= -L$(USRLIBDIR) -lXpm
-XPMINCLUDE		= -I $(INCDIR)
+XPMINCLUDE		= -I$(INCDIR)/X11
+
+CFLAGS += -DNO_CUSERID
 
 # *****************************************************************************
 # I hope you don't need to change anything below this point
@@ -181,8 +185,8 @@
 	    chmod 755 $(XPATLIBDIR)/$$f; \
 	done
 	mkdirhier $(XPATMANDIR)
-	cp xpat2.man $(XPATMANDIR)/xpat2.6x
-	chmod 644 $(XPATMANDIR)/xpat2.6x
+	cp xpat2.man $(XPATMANDIR)/xpat2.6
+	chmod 644 $(XPATMANDIR)/xpat2.6
 
 ComplexProgramTarget($(MYPROG))
 InstallAppDefaults(XPat)
