--- spkit/spkit/Makefile.linux.orig	Fri Jul  5 06:10:23 2002
+++ spkit/spkit/Makefile.linux	Sun Jan  5 22:15:45 2003
@@ -1,15 +1,15 @@
-CC      = gcc
-CXX     = g++
+CC      ?= gcc
+CXX     ?= g++
 SOUND   = ../../sound
 TOOLTIP = ../../tooltips
 BACKDIR = ../../bak/spkit/spkit
 MAINDIR = ../../main
 HOMEDIR = $(HOME)
-X11DIR  = /usr/X11R6
-INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR)
-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
+X11DIR  = ${X11BASE}
+INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR)
+CCFLAGS += $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 DEBUG   = -g3
-OPTIM   = -O2
+OPTIM   = ${CXXFLAGS}
 
 .c.o:
 	$(CC) $(CCFLAGS) -c $*.c -o $*.o