--- makefile-unix	Mon Sep 20 20:27:38 1999
+++ makefile-unix.new	Tue Jun 20 15:55:25 2000
@@ -22,19 +22,19 @@
 
 ###### Tools
 
-CXX = g++
+CXX ?= c++
 AR = ar
 RANLIB = ranlib
 
 ###### Compiler/linker flags
 
-DBG_CXX_FLAGS = -DDW_DEBUG_VERSION -D_REENTRANT -g -fexceptions -I./src
+DBG_CXX_FLAGS = -DDW_DEBUG_VERSION -D_REENTRANT ${CXXFLAGS} -I./src
 DBG_LINK_FLAGS = 
 
-DEV_CXX_FLAGS = -DDW_DEVELOPMENT_VERSION -D_REENTRANT -g -fexceptions -I./src
+DEV_CXX_FLAGS = -DDW_DEVELOPMENT_VERSION -D_REENTRANT ${CXXFLAGS} -I./src
 DEV_LINK_FLAGS = 
 
-REL_CXX_FLAGS = -DDW_PRODUCTION_VERSION -D_REENTRANT -fexceptions -I./src
+REL_CXX_FLAGS = -DDW_PRODUCTION_VERSION -D_REENTRANT ${CXXFLAGS} -I./src
 REL_LINK_FLAGS = 
 
 ###### Default target