--- Make-common.orig	Tue Feb 13 00:50:39 2001
+++ Make-common	Wed Mar 28 10:50:04 2001
@@ -33,7 +33,7 @@
 #
 # C options
 #
-CFLAGS	= $(LCFLAGS) $(PCFLAGS) $(GCFLAGS) $(COPTIMIZER) $(MKDEPOPT) $(CWOFF)
+CFLAGS	+= $(LCFLAGS) $(PCFLAGS) $(GCFLAGS) $(COPTIMIZER) $(MKDEPOPT) $(CWOFF)
 LCFLAGS	= $(LCDEFS) $(LCINCS) $(LCOPTS)
 PCFLAGS	= $(PCDEFS) $(PCINCS) $(PCOPTS)
 GCFLAGS	= $(GCDEFS) $(GCINCS) $(GCOPTS)
@@ -51,7 +51,7 @@
 #
 # C++ options
 #
-CXXFLAGS  = $(LCXXFLAGS) $(PCXXFLAGS) $(GCXXFLAGS) $(CXXOPTIMIZER) $(MKDEPOPT) $(CXXWOFF)
+CXXFLAGS  += $(LCXXFLAGS) $(PCXXFLAGS) $(GCXXFLAGS) $(CXXOPTIMIZER) $(MKDEPOPT) $(CXXWOFF)
 LCXXFLAGS = $(LCXXDEFS) $(LCXXINCS) $(LCXXOPTS)
 PCXXFLAGS = $(PCXXDEFS) $(PCXXINCS) $(PCXXOPTS)
 GCXXFLAGS = $(GCXXDEFS) $(GCXXINCS) $(GCXXOPTS)
@@ -167,13 +167,13 @@
 #
 # default to optimized build
 #
-ifdef DEBUG
+.ifdef DEBUG
 COPTIMIZER    = $(CDEBUG)
 CXXOPTIMIZER  = $(CXXDEBUG)
-else
+.else
 COPTIMIZER    = $(COPT)
 CXXOPTIMIZER  = $(CXXOPT)
-endif
+.endif
 
 #
 # slurp up configuration