--- Makefile.Linux.orig	Wed Jul 17 22:10:55 1996
+++ Makefile.Linux	Fri Nov 24 16:10:03 2006
@@ -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
 
@@ -9,9 +9,9 @@
 
 ### Directories for include files of X11 and libraries
 
-X_INCLUDE	= /usr/X11R6/include
+X_INCLUDE	= $(LOCALBASE)/include
 
-XLIB_DIR		= /usr/X11R6/lib
+XLIB_DIR		= $(LOCALBASE)/lib
 
 ###################################################################
 
@@ -20,7 +20,7 @@
 .SUFFIXES: .C .o
 
 .C.o:
-	$(CXX) -I$(X_INCLUDE) $(CXXFLAGS) -c $<
+	$(CXX) $(CXXFLAGS) -c $<
 
 LD	      = $(CXX)