mirror of
https://github.com/openwrt/telephony.git
synced 2025-05-01 10:11:21 +08:00
8ef219c850
Pick patch from @dhewg so we keep pjproject in sync with the version bundled with Asterisk. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
25 lines
926 B
Diff
25 lines
926 B
Diff
--- a/libpjproject.pc.in
|
|
+++ b/libpjproject.pc.in
|
|
@@ -2,8 +2,8 @@
|
|
|
|
prefix=@PREFIX@
|
|
exec_prefix=${prefix}
|
|
-libdir=@LIBDIR@
|
|
-includedir=@INCLUDEDIR@
|
|
+libdir=${exec_prefix}/lib
|
|
+includedir=${prefix}/include
|
|
|
|
Name: libpjproject
|
|
Description: Multimedia communication library
|
|
--- a/build.mak.in
|
|
+++ b/build.mak.in
|
|
@@ -351,6 +351,6 @@ export PJ_LIBXX_FILES := $(APP_LIBXX_FIL
|
|
export PJ_INSTALL_DIR := @prefix@
|
|
export PJ_INSTALL_INC_DIR := @includedir@
|
|
export PJ_INSTALL_LIB_DIR := @libdir@
|
|
-export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1 @ac_cflags@
|
|
+export PJ_INSTALL_CFLAGS := -DPJ_AUTOCONF=1 @ac_cflags@
|
|
export PJ_INSTALL_LDFLAGS_PRIVATE := $(APP_THIRD_PARTY_LIBS) $(APP_THIRD_PARTY_EXT) @LIBS@
|
|
-export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(filter-out $(PJ_INSTALL_LDFLAGS_PRIVATE),$(APP_LDXXLIBS))
|
|
+export PJ_INSTALL_LDFLAGS := $(filter-out $(PJ_INSTALL_LDFLAGS_PRIVATE),$(APP_LDXXLIBS))
|