[SCM] rem/master: Fix libre.pc for multi-arch target and install

vasudev-guest at users.alioth.debian.org vasudev-guest at users.alioth.debian.org
Sat Jan 16 05:12:15 UTC 2016


The following commit has been merged in the master branch:
commit 2ec088ac9428cd320b538ceb0ae53b0fa837d387
Author: Vasudev Kamath <kamathvasudev at gmail.com>
Date:   Sat Jan 16 10:41:52 2016 +0530

    Fix libre.pc for multi-arch target and install

diff --git a/debian/rules b/debian/rules
index 727154b..8d9c206 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,6 +55,7 @@ install_rem_package:
 		LIBDIR=$(LIBDIR) \
 		LIB_SUFFIX=.so.0
 	cd debian/tmp/$(LIBDIR) && ln -s -f librem.so.0 librem.so
+	sed -i "s,libdir=\$${prefix}/lib,libdir=\$${prefix}/lib/$(DEB_TARGET_MULTIARCH)," debian/tmp/$(LIBDIR)/pkgconfig/librem.pc
 
 binary-post-install/$(pkg-lib) binary-post-install/$(pkg-dev):: \
  debian/stamp-local-shlibs-$(lib)
@@ -67,7 +68,8 @@ debian/stamp-local-shlibs-$(lib): \
 		--override s/$(lib)$(major)-dev/$(lib)-dev/ \
 		--movedev "debian/tmp/usr/include/*" usr/include/ \
 		debian/tmp/usr/lib/$(lib).so
-		touch $@
+	mv debian/tmp$(LIBDIR)pkgconfig debian/$(pkg-lib)/usr/lib/$(DEB_TARGET_MULTIARCH)/
+	touch $@
 clean::
 	rm -f debian/stamp-local-shlibs-$(lib)
 	make clean

-- 
rem packaging



More information about the pkg-multimedia-commits mailing list