--- Makefile.orig	2013-01-10 22:58:10.000000000 +0000
+++ Makefile	2013-02-09 19:53:19.000000000 +0000
@@ -18,10 +18,6 @@
 #           From Hewlett Packard Company.
 #
 
--include local.mk
-SVN_VERSION=$(shell if test -d .svn ; then svnversion . | sed -e 's/^/svn/;' ;  else echo unknown ; fi)
-VERINFO=-DSVN_VERSION="\"$(SVN_VERSION)\""
-
 # Output binary to be built
 OUTPUT=sipp
 
@@ -73,7 +69,7 @@
 CC_SunOS=gcc
 CC_Cygwin=cc  
 CC_Darwin=cc  
-CC=$(CC_$(SYSTEM))
+CC?=$(CC_$(SYSTEM))
 
 # C++ compiler mapping
 CPP_hpux=aCC  
@@ -83,7 +79,7 @@
 CPP_SunOS=g++
 CPP_Cygwin=g++  
 CPP_Darwin=g++  
-CPP=$(CPP_$(SYSTEM))
+CPP?=$(CPP_$(SYSTEM))
 
 #Model specific flags
 MFLAGS_ia64=+DD64
@@ -106,7 +102,7 @@
 CFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
 CFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
 CFLAGS_Darwin=-D__DARWIN
-CFLAGS=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(SCTP) $(PCAPPLAY) $(EXTRACFLAGS) $(UNITTEST)
+CFLAGS+=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(SCTP) $(PCAPPLAY) $(EXTRACFLAGS) $(UNITTEST)
 
 #C++ Compiler Flags
 CPPFLAGS_hpux=-AA -mt -D__HPUX -D_INCLUDE_LONGLONG -DNOMACROS +W829  
@@ -116,7 +112,7 @@
 CPPFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
 CPPFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
 CPPFLAGS_Darwin=-D__DARWIN
-CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(SCTP) $(PCAPPLAY) $(EXTRACPPFLAGS) $(UNITTEST)
+CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(SCTP) $(PCAPPLAY) $(EXTRACPPFLAGS) $(UNITTEST)
 
 #Linker mapping
 CCLINK_hpux=aCC
@@ -126,7 +122,7 @@
 CCLINK_SunOS=gcc
 CCLINK_Cygwin=g++
 CCLINK_Darwin=g++
-CCLINK=$(CCLINK_$(SYSTEM))
+CCLINK?=$(CCLINK_$(SYSTEM))
 
 #Linker Flags
 LFLAGS_hpux=-AA -mt
@@ -158,8 +154,6 @@
 INCDIR_Darwin=-I. -I/usr/local/ssl/include
 INCDIR=$(INCDIR_$(SYSTEM)) 
 
--include local.mk
-
 # Building without TLS (no openssl pre-requisite)
 all:
 	$(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` $(OUTPUT)