--- Makefile.old	Mon Aug 26 10:37:17 2002
+++ Makefile	Mon Aug 26 10:39:35 2002
@@ -13,9 +13,8 @@
 # Where are shhmsg, shhopt, xalloc, shhcards, Xpm and X11?
 
 # GNU/Linux at home
-INCDIR		= -I/usr/local/include -I/usr/X11R6/include \
-		  -I/usr/local/include/X11
-LIBDIR		= -L/usr/local/lib -L/usr/X11R6/lib -L/usr/local/lib/X11
+INCDIR		= -I${LOCALBASE}/include -I${X11BASE}/include
+LIBDIR		= -L${LOCALBASE}/lib -L${X11BASE}/lib
 EXTRA_LIBS	= -lSM -lICE
 
 # Irix at Ifi
@@ -54,18 +53,18 @@
 endif
 
 # DEC Alpha at USIT
-ifeq ($(HOSTTYPE),alpha)
-INCDIR		= -I$$HOME/include -I/usr/include/X11 \
-		  -I/usr/local/X11R5/include
-LIBDIR		= -L$$HOME/lib/$$HOSTTYPE -L/usr/lib/X11 -L/usr/local/X11R5/lib
-endif
+#ifeq ($(HOSTTYPE),alpha)
+#INCDIR		= -I$$HOME/include -I/usr/include/X11 \
+#		  -I/usr/local/X11R5/include
+#LIBDIR		= -L$$HOME/lib/$$HOSTTYPE -L/usr/lib/X11 -L/usr/local/X11R5/lib
+#endif
 
 ###########################################################################
 
 # Where do you want to install the program and the highscore file?
-INSTLIBDIR	= /var/local/lib/games
-INSTBINDIR	= /usr/local/games
-INSTMANDIR	= /usr/local/man/man6
+INSTLIBDIR	= ${PREFIX}/lib/games
+INSTBINDIR	= ${PREFIX}/games
+INSTMANDIR	= ${PREFIX}/man/man6
 #INSTLIBDIR	= /hom/sverrehu/lib
 #INSTBINDIR	= /hom/sverrehu/bin/$$HOSTTYPE
 #INSTMANDIR	= /hom/sverrehu/man/man6
@@ -85,11 +84,11 @@
 
 ###########################################################################
 
-CC		= gcc
+#CC		= gcc
 
 OPTIM		= -s -O2
-CCOPT		= -Wall $(OPTIM) $(INCDIR) $(DEFINES) $(CFLAGS)
-LDOPT		= -s $(LIBDIR) $(LDFLAGS) $(EXTRA_LD_OPT)
+CCOPT		= $(INCDIR) $(DEFINES) $(CFLAGS)
+LDOPT		= $(LIBDIR) $(LDFLAGS) $(EXTRA_LD_OPT)
 
 LIBS		= -lshhopt -lshhmsg -lxalloc -lshhcards \
 		  -lXaw -lXt -lXpm -lXext -lXmu -lX11 $(EXTRA_LIBS)