--- Makefile.orig	2007-09-06 11:51:24.000000000 +0300
+++ Makefile	2007-09-08 19:16:08.000000000 +0300
@@ -18,8 +18,6 @@
 #           From Hewlett Packard Company.
 #
 
--include local.mk
-
 # Output binary to be built
 OUTPUT=sipp
 
@@ -69,7 +67,7 @@
 CC_SunOS=gcc
 CC_Cygwin=cc  
 CC_Darwin=cc  
-CC=$(CC_$(SYSTEM))
+CC?=$(CC_$(SYSTEM))
 
 # C++ compiler mapping
 CPP_hpux=aCC  
@@ -79,7 +77,7 @@
 CPP_SunOS=g++
 CPP_Cygwin=g++  
 CPP_Darwin=g++  
-CPP=$(CPP_$(SYSTEM))
+CPP?=$(CPP_$(SYSTEM))
 
 #Model specific flags
 MFLAGS_ia64=+DD64
@@ -102,7 +100,7 @@
 CFLAGS_SunOS=-g -D__SUNOS
 CFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
 CFLAGS_Darwin=-D__DARWIN
-CFLAGS=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)
+CFLAGS+=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)
 
 #C++ Compiler Flags
 CPPFLAGS_hpux=-AA -mt -D__HPUX +W829 
@@ -112,7 +110,7 @@
 CPPFLAGS_SunOS=-g -D__SUNOS
 CPPFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
 CPPFLAGS_Darwin=-D__DARWIN
-CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)
+CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)
 
 #Linker mapping
 CCLINK_hpux=aCC
@@ -122,7 +120,7 @@
 CCLINK_SunOS=gcc
 CCLINK_Cygwin=g++
 CCLINK_Darwin=g++
-CCLINK=$(CCLINK_$(SYSTEM))
+CCLINK?=$(CCLINK_$(SYSTEM))
 
 #Linker Flags
 LFLAGS_hpux=-AA -mt
@@ -154,8 +152,6 @@
 INCDIR_Darwin=-I. -I/usr/local/ssl/include
 INCDIR=$(INCDIR_$(SYSTEM)) 
 
--include local.mk
-
 # Building without TLS and authentication (no openssl pre-requisite)
 all:
 	make OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` $(OUTPUT)