[sr-dev] git:master: regex: fix cross-compilation

Ovidiu Sas osas at voipembedded.com
Sun Dec 2 21:12:20 CET 2012


Module: sip-router
Branch: master
Commit: 50f4cd86ccebab713c2b9895cdffbd619e84955e
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50f4cd86ccebab713c2b9895cdffbd619e84955e

Author: Ovidiu Sas <osas at voipembedded.com>
Committer: Ovidiu Sas <osas at voipembedded.com>
Date:   Sun Dec  2 15:07:28 2012 -0500

regex: fix cross-compilation

---

 modules_k/regex/Makefile |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules_k/regex/Makefile b/modules_k/regex/Makefile
index 97b80c4..947c14c 100644
--- a/modules_k/regex/Makefile
+++ b/modules_k/regex/Makefile
@@ -4,20 +4,20 @@ include ../../Makefile.defs
 auto_gen=
 NAME=regex.so
 
+ifeq ($(CROSS_COMPILE),)
 BUILDER = $(shell which pcre-config)
+endif
 
 ifeq ($(BUILDER),)
-	PCREDEFS=-I$(LOCALBASE)/include -I/usr/local/include -I/opt/include \
-	-I/usr/sfw/include
-	PCRELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \
-	-L/opt/lib -lpcre
+	PCREDEFS=-I$(LOCALBASE)/include
+	PCRELIBS=-L$(LOCALBASE)/lib -lpcre
 else
 	PCREDEFS = $(shell pcre-config --cflags)
 	PCRELIBS = $(shell pcre-config --libs)
 endif
 
 DEFS+=$(PCREDEFS)
-LIBS=$(PCRELIBS)
+LIBS+=$(PCRELIBS)
 
 DEFS+=-DKAMAILIO_MOD_INTERFACE
 




More information about the sr-dev mailing list