--- Makefile.orig	2011-01-11 02:35:54 UTC
+++ Makefile
@@ -3,8 +3,8 @@
 # Makefile for Unix and GNU/Linux with gcc/g++ compiler
 # Edit here:
 
-CC=gcc
-CPP=g++
+CC?=gcc
+CPP=$(CXX)
 
 # Hints:
 # if you use egcs-2.90.* version of GCC please add option -fno-exceptions 
@@ -20,7 +20,7 @@ CPP=g++
 
 # Optimized version
 
-CFLAGS = -c -Wall -O2 -g
+CFLAGS+= -c -Wall -g
 # -DSLIST removed because it wouldn't compile under gcc 3.x
 # add -DHASH_TABLE for extra speed (may sometimes produce inconsistent results)