diff --git a/debian/rules b/debian/rules index 188b253b7556d4c4677f446d4ac69e4ef2995eea..76cc4418acb93f2140b57733c101ea4041f0229d 100755 --- a/debian/rules +++ b/debian/rules @@ -34,9 +34,8 @@ build-arch-stamp: configure-stamp # Add here commands to compile the arch part of the package. $(MAKE) && (cd sflphone-gtk) - # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! $(MAKE) - cd libs/pjproject-1.0; $(MAKE) dep; $(MAKE) clean; $(MAKE) + cd libs/pjproject-1.0; $(MAKE) dep; $(MAKE) touch $@ build-indep: build-indep-stamp @@ -67,10 +66,6 @@ install-indep: dh_clean -k -i dh_installdirs -i # Add here commands to install the package into debian/sflphone. - $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install - cd sflphone-gtk; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install - cd libs/pjproject-1.0; $(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install - dh_install -i install-arch: dh_testdir diff --git a/libs/pjproject-1.0/Makefile b/libs/pjproject-1.0/Makefile index 1e3f9795ace56b21b71bff3e73925d638fd561f3..6bb17605258131aad3c39612c2c98d27ab7e468b 100644 --- a/libs/pjproject-1.0/Makefile +++ b/libs/pjproject-1.0/Makefile @@ -73,9 +73,9 @@ prefix = /usr/local install: mkdir -p $(DESTDIR)$(prefix)/lib cp -L $$(find . -name '*.a') $(DESTDIR)$(prefix)/lib - cp -RL $$(find ./pjnath ./third_party ./pjsip ./pjmedia ./pjlib ./pjlib-util -name include) $(DESTDIR)$(prefix) - cd $(DESTDIR)$(prefix)/lib && for i in $$(find . -name 'libpj*a'); do\ + cp -RL $$(find ./pjnath ./pjsip ./pjmedia ./pjlib ./pjlib-util ./pjsip-apps -name include) $(DESTDIR)$(prefix) + cd $(DESTDIR)$(prefix)/lib; for i in $$(find . -name 'libpj*a'); do\ ln -s $$i $$(echo $$i | sed -e "s/-$(TARGET_NAME)//");\ - done + done mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig sed -e "s!@PREFIX@!$(DESTDIR)$(prefix)!" libpj-sfl.pc.in > $(DESTDIR)/$(prefix)/lib/pkgconfig/libpj-sfl.pc