--- src/Makefile.orig	Sun Apr  8 19:58:59 2001
+++ src/Makefile	Mon Nov  4 21:24:23 2002
@@ -1,13 +1,13 @@
 # Don't change this...
-CXX=g++
+CXX?=g++
 LFLAGS=
-COMMONFLAGS=-Wall -O2 -g
+#COMMONFLAGS=-Wall -O2 -g
 ROUTER_FLAGS=$(COMMONFLAGS) -DROUTER
 DAEMON_FLAGS=$(COMMONFLAGS) -DDAEMON
 CONSOLE_FLAGS=$(COMMONFLAGS) -DCONSOLE
 
 # Change this instead.
-CXXFLAGS=$(CONSOLE_FLAGS)
+CXXFLAGS+=$(CONSOLE_FLAGS)
 
 # Nothing below here should be changed
 
@@ -98,7 +98,7 @@
 	cp -f UserLib.a ../lib
 
 depend:
-	makedepend -Y -- $(CPP_FILES) $(RC_CPP) $(USER_CPP)
+	makedepend -- $(CPP_FILES) $(RC_CPP) $(USER_CPP)
 	make -C RC depend
 
 clean: