@@ -5,13 +5,11 @@ include ../../Makefile.defs

 auto_gen=

 NAME=phonenum.so

-CXX=g++

-LD=g++

-LIB_DIR = /opt/local/lib

+CXX?=g++

+LD?=g++

-LIBS= -L${LIB_DIR} cphonenumber.o -lphonenumber -lgeocoding

-

-DEFS+= -I/opt/local/include

+LIBS+=-L$(LOCALBASE)/lib cphonenumber.o -lphonenumber -lgeocoding

+DEFS+=-I$(LOCALBASE)/include

 CXXFLAGS=$(CFLAGS:-Wno-deprecated option=)

 CXXFLAGS+=-Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing

@@ -2,11 +2,11 @@ include ../../Makefile.defs

 auto_gen=

 NAME=rtp_media_server.so

-DEFS+=-I$(LOCALBASE)/lib

+DEFS+=-I$(LOCALBASE)/include

 ORTPLIBS=-lortp

 BCUNITLIBS=-lbcunit

 MS2LIBS=-lmediastreamer

-LIBS=$(ORTPLIBS) $(BCUNITLIBS) $(MS2LIBS)

+LIBS+=-L$(LOCALBASE)/lib $(ORTPLIBS) $(BCUNITLIBS) $(MS2LIBS)

 include ../../Makefile.modules

@@ -39,7 +39,8 @@ endif

 LIBS+= $(TLS_EXTRA_LIBS)

 ifeq ($(EMBEDDED_UTF8_DECODE),0)

-	LIBS+= -lunistring

+	DEFS += -I$(LOCALBASE)/include

+	LIBS += -lunistring

 else

 	DEFS += -DEMBEDDED_UTF8_DECODE

 endif