--- Makefile.orig	2013-06-14 20:51:43 UTC
+++ Makefile
@@ -21,7 +21,7 @@
 # Include machine/platform specific information
 include machdef.mk
 
-CFLAGS=-I. $(TCL_INCLUDE) $(X_INCLUDE) $(OPTIONS) $(MACHINESPEC)
+CFLAGS+=-I. $(TCL_INCLUDE) $(X_INCLUDE) $(OPTIONS) $(MACHINESPEC)
 
 OBJECTS = \
 	e93.o \
@@ -49,10 +49,10 @@ OBJECTS = \
 	abort.o \
 	errors.o
 
-all : xgui/libgui.a e93
+all : e93
 
 e93 : $(OBJECTS) xgui/libgui.a
-	$(CC) -O $(OBJECTS) -Lxgui -lgui -lstdc++ \
+	$(CC) $(CFLAGS:N-D*:N-I*) $(OBJECTS) -Lxgui -lgui \
 		$(X_LIB) -lX11 -lXmu -lXinerama \
 		$(TCL_LIB) -ltcl$(TCL_VERSION) \
 		$(EXTRALIBS) \