Bug#852354: move ptlib.pc to a multiarch location

[Helmut Grohne]

Source: ptlib
Version: 2.10.11~dfsg-2.1
Tags: patch
Control: affects -1 + src:opal
User: helmutg at debian.org
Usertags: rebootstrap

opal fails to cross build from source, because pkg-config cannot find
ptlib.pc. During cross compilation /usr/lib/pkgconfig is not considered.
Thus ptlib.pc should be moved to
/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig. The attached patch does just
that. Please consider applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru ptlib-2.10.11~dfsg/debian/changelog ptlib-2.10.11~dfsg/debian/changelog
--- ptlib-2.10.11~dfsg/debian/changelog	2016-11-30 18:58:13.000000000 +0100
+++ ptlib-2.10.11~dfsg/debian/changelog	2017-01-23 20:49:03.000000000 +0100
@@ -1,3 +1,10 @@
+ptlib (2.10.11~dfsg-2.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Pass multiarch --libdir to ./configure (Closes: #-1).
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 23 Jan 2017 20:49:03 +0100
+
 ptlib (2.10.11~dfsg-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --minimal -Nru ptlib-2.10.11~dfsg/debian/libpt-dev.install ptlib-2.10.11~dfsg/debian/libpt-dev.install
--- ptlib-2.10.11~dfsg/debian/libpt-dev.install	2014-01-08 17:40:55.000000000 +0100
+++ ptlib-2.10.11~dfsg/debian/libpt-dev.install	2017-01-23 20:48:53.000000000 +0100
@@ -1,6 +1,6 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 version.h usr/include/ptlib
 usr/share/ptlib
diff --minimal -Nru ptlib-2.10.11~dfsg/debian/libpt2.10.11.install ptlib-2.10.11~dfsg/debian/libpt2.10.11.install
--- ptlib-2.10.11~dfsg/debian/libpt2.10.11.install	2014-01-08 17:40:55.000000000 +0100
+++ ptlib-2.10.11~dfsg/debian/libpt2.10.11.install	2017-01-23 20:48:59.000000000 +0100
@@ -1,2 +1,2 @@
-usr/lib/libpt.so.*.*[.-]*
-usr/lib/ptlib-*/devices/
+usr/lib/*/libpt.so.*.*[.-]*
+usr/lib/*/ptlib-*/devices/
diff --minimal -Nru ptlib-2.10.11~dfsg/debian/rules ptlib-2.10.11~dfsg/debian/rules
--- ptlib-2.10.11~dfsg/debian/rules	2016-11-30 18:58:13.000000000 +0100
+++ ptlib-2.10.11~dfsg/debian/rules	2017-01-23 20:48:33.000000000 +0100
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+
 export STDCXXFLAGS = -std=gnu++98
 
 DEBVERSION := $(shell head -n 1 debian/changelog \
@@ -22,7 +24,7 @@
 	dh_clean
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-oss --enable-v4l --disable-avc --disable-dc --enable-exceptions
+	dh_auto_configure -- --enable-oss --enable-v4l --disable-avc --disable-dc --enable-exceptions --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_build:
 	dh_auto_build -- optshared docs