--- Makefile.orig	Sun Nov  3 13:08:10 2002
+++ Makefile	Sun Nov  3 13:08:55 2002
@@ -6,12 +6,12 @@
 ###############################################################################
 
 ## C and C++ compiler to use
-CC = gcc
-CXX = g++
+CC ?= gcc
+CXX ?= g++
 
 ## C and C++ compiler flags
-CCFLAGS = -O
-CXXFLAGS = -O -ansi -Wall -D_G_NO_EXTERN_TEMPLATES
+CCFLAGS = $(CFLAGS)
+CXXFLAGS += -ansi -D_G_NO_EXTERN_TEMPLATES -DUSE_STD
 
 ## System Includes
 SYS_INCLUDES =