Browse code

Merge ca4a0b586a99d09d4042d7df2ff95cce12808dbb into af080336e1d63cf51d0f29ed946ebfb73c2c77f0

Boris Korzun authored on 18/01/2022 19:46:35 • GitHub committed on 18/01/2022 19:46:35
Showing 3 changed files
... ...
@@ -5,13 +5,11 @@ include ../../Makefile.defs
5 5
 auto_gen=
6 6
 NAME=phonenum.so
7 7
 
8
-CXX=g++
9
-LD=g++
10
-LIB_DIR = /opt/local/lib
8
+CXX?=g++
9
+LD?=g++
11 10
 
12
-LIBS= -L${LIB_DIR} cphonenumber.o -lphonenumber -lgeocoding
13
-
14
-DEFS+= -I/opt/local/include
11
+LIBS+=-L$(LOCALBASE)/lib cphonenumber.o -lphonenumber -lgeocoding
12
+DEFS+=-I$(LOCALBASE)/include
15 13
 
16 14
 CXXFLAGS=$(CFLAGS:-Wno-deprecated option=)
17 15
 CXXFLAGS+=-Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing
... ...
@@ -2,11 +2,11 @@ include ../../Makefile.defs
2 2
 auto_gen=
3 3
 NAME=rtp_media_server.so
4 4
 
5
-DEFS+=-I$(LOCALBASE)/lib
5
+DEFS+=-I$(LOCALBASE)/include
6 6
 
7 7
 ORTPLIBS=-lortp
8 8
 BCUNITLIBS=-lbcunit
9 9
 MS2LIBS=-lmediastreamer
10 10
 
11
-LIBS=$(ORTPLIBS) $(BCUNITLIBS) $(MS2LIBS)
11
+LIBS+=-L$(LOCALBASE)/lib $(ORTPLIBS) $(BCUNITLIBS) $(MS2LIBS)
12 12
 include ../../Makefile.modules
... ...
@@ -39,7 +39,8 @@ endif
39 39
 LIBS+= $(TLS_EXTRA_LIBS)
40 40
 
41 41
 ifeq ($(EMBEDDED_UTF8_DECODE),0)
42
-	LIBS+= -lunistring
42
+	DEFS += -I$(LOCALBASE)/include
43
+	LIBS += -lunistring
43 44
 else
44 45
 	DEFS += -DEMBEDDED_UTF8_DECODE
45 46
 endif