--- Makefile.orig	Thu Feb 13 19:58:06 2003
+++ Makefile	Thu Feb 13 19:58:18 2003
@@ -17,8 +17,8 @@
 
 # new gnu compilers have a really annoying default behavior of wrapping
 # error message lines. The default should be NO-WRAPPING.
-OPTIONS=-O2 -Wall -x c++ -fmessage-length=0
-CFLAGS=$(INCLUDES) $(OPTIONS)
+OPTIONS=-x c++
+CFLAGS+=$(INCLUDES) $(OPTIONS)
 
 OBJECTS = \
 	globals.o \