summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLiong Sauw Ming <ming@teluu.com>2014-03-06 03:33:40 +0000
committerLiong Sauw Ming <ming@teluu.com>2014-03-06 03:33:40 +0000
commit118a33df9af8b9e41a026e1a2bc41adac8af2dba (patch)
treeecbb30ac66f3f6fb48322950712c9e46c4caf85a /Makefile
parent4984e13186aed5849fcb46b003b5cb0eadf25dbb (diff)
Re #1742 (misc): Add pjsua2 to make install and pkgconfig description and fix its library path
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4781 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 03d0bbaa..33a4e6b2 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,8 @@ pjsua-test:
install:
mkdir -p $(DESTDIR)$(libdir)/
- cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/
+# cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/
+ cp -af $(APP_LIBXX_FILES) $(DESTDIR)$(libdir)/
mkdir -p $(DESTDIR)$(includedir)/
for d in pjlib pjlib-util pjnath pjmedia pjsip; do \
cp -RLf $$d/include/* $(DESTDIR)$(includedir)/; \
@@ -117,8 +118,10 @@ install:
sed -e "s!@INCLUDEDIR@!$(includedir)!" | \
sed -e "s!@LIBDIR@!$(libdir)!" | \
sed -e "s/@PJ_VERSION@/$(PJ_VERSION)/" | \
- sed -e "s!@PJ_LDLIBS@!$(PJ_LDLIBS)!" | \
- sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)/$(libdir)/pkgconfig/libpjproject.pc
+ sed -e "s!@PJ_LDLIBS@!!" | \
+ sed -e "s!@PJ_LDXXLIBS@!$(PJ_LDXXLIBS)!" | \
+ sed -e "s!@PJ_INSTALL_CFLAGS@!!" | \
+ sed -e "s!@PJ_INSTALL_CXXFLAGS@!$(PJ_INSTALL_CXXFLAGS)!" > $(DESTDIR)/$(libdir)/pkgconfig/libpjproject.pc
uninstall:
$(RM) $(DESTDIR)$(libdir)/pkgconfig/libpjproject.pc