--- Makefile.orig	Thu Jan 16 08:31:58 1997
+++ Makefile	Thu Nov  6 14:56:38 2003
@@ -23,7 +23,7 @@
 # (the program should compile with no warning messages - if you
 #  see a warning message please let me know about it)
 # ------------------------------------------------------------
-CC = CC
+#CC = CC
 
 
 # STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
@@ -51,9 +51,9 @@
 #         with the other Makefile.)
 #
 # ------------------------------------------------------------
-OS = -DSGIVERSION
+#OS = -DSGIVERSION
 # or
-#OS = -DSUNVERSION
+OS = -DSUNVERSION
 # or
 #OS = -DLINUXVERSION
 # or
@@ -77,8 +77,8 @@
 # in audio.c then everything works fine.
 #
 # ------------------------------------------------------------
-AUDIOLIB = -laudio -laudiofile
-AUDIODEF = -DSGIAUDIO
+#AUDIOLIB = -laudio -laudiofile
+#AUDIODEF = -DSGIAUDIO
 
 
 # STEP 6: IF YOU ARE COMPILING FOR A SUN AND WANT (RUDIMENTARY)
@@ -91,7 +91,7 @@
 
 # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
 # ------------------------------------------------------------
-CFLAGS     = -O  -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
+CFLAGS+= -I${X11BASE}/include -DPREFIX=\"${PREFIX}\"
 
 
 # STEP 8: ADD ANY SPECIAL LIBRARY PATHS
@@ -106,12 +106,12 @@
 TARGET 	= battalion
 
 OBJ 	= battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o
-LIBS    = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
+LIBS    = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat $(PTHREAD_LIBS)
 
 all:	$(TARGET)
 
 $(OBJ): $(?:.o=.c)
-	$(CC) $(CFLAGS) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIODEF) -c $?
+	$(CC) $(CFLAGS) $(PTHREAD_CFLAGS) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIODEF) -c $?
 
 $(TARGET): $(OBJ)
 	$(CC) -o $(TARGET) $(OBJ) $(LIBFLAGS) $(GLIB) $(LIBS) $(AUDIOLIB)