--- Makefile.orig	Tue Jun 19 10:19:01 2007
+++ Makefile	Fri Jun 22 23:30:42 2007
@@ -1,12 +1,12 @@
 PREFIX = /usr/local
 
-CC = g++
-OPTS = -O2 -ffast-math -funroll-loops -Wall -fPIC -DPIC
+CC = $(CXX)
+OPTS = -Wall -fPIC -DPIC
 #OPTS = -g -DDEBUG 
 
 -include defines.make
 
-CFLAGS = $(OPTS) $(_CFLAGS)
+CFLAGS += $(OPTS)
 
 PLUG = caps
 VERSION = 0.4.2