--- Makefile.Linux.orig	Wed Jul 17 13:10:55 1996
+++ Makefile.Linux	Sun Sep  8 14:02:00 2002
@@ -1,7 +1,7 @@
 
 ### compiler section
-CXX			= gcc -Wall -fstrength-reduce -fpcc-struct-return
-CXXFLAGS	   = -g -DUSE_MIT_SHM
+CXX			?= c++
+CXXFLAGS	   += -Wall -fstrength-reduce -fpcc-struct-return -DUSE_MIT_SHM -I${X_INCLUDE}
 
 ### default file to be used, when no options are set
 
@@ -20,7 +20,7 @@
 .SUFFIXES: .C .o
 
 .C.o:
-	$(CXX) -I$(X_INCLUDE) $(CXXFLAGS) -c $<
+	$(CXX) $(CXXFLAGS) -c $<
 
 LD	      = $(CXX)