--- Makefile.orig	Thu Feb 26 09:14:35 1998
+++ Makefile	Wed Nov  8 22:45:42 2000
@@ -25,10 +25,10 @@
 
   # Directory for XNibbles specific data
   # This must be set correctly at compile time
-  DATADIR = /usr/local/games/xnibbles
+  DATADIR = ${PREFIX}/share/xnibbles
 
   # Prefix to find bin and man directories for installation
-  PREFIX  = /usr/local
+  PREFIX  ?= /usr/local
 
   # Install program
   INSTALL = /usr/bin/install
@@ -76,9 +76,9 @@
 
 linux:
 	$(MAKE) OBJECTS=$(OBJECTS) \
-	CC=$(CC) LDFLAGS='-L/usr/X11R6/lib' \
-	CFLAGS='-Wall -O2 $(SDEV) \
-	-I/usr/X11R6/include -fwritable-strings \
+	CC=${CXX} LDFLAGS='-L${X11BASE}/lib' \
+	CFLAGS='${CXXFLAGS} $(SDEV) \
+	-I${X11BASE}/include -fwritable-strings \
 	$(JDEV) -DDATADIR=\"$(DATADIR)\"' \
 	xnibbles
 
