Bug#911254: libclanlib-dev: move .pc files to a multiarch location

[Helmut Grohne]

Package: libclanlib-dev
Version: 1.0~svn3827-7
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap
Control: affects -1 + src:trophy

trophy fails to cross build from source, because it cannot find
clanApp-1.0.pc. During cross compilation, pkg-config does not search
/usr/lib/pkgconfig. Please move the .pc files to
/usr/lib/<triplet>/pkgconfig. The attached patch implements that using
dh_auto_configure, which passes a multiarch --libdir since compat level
9. Please consider applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru clanlib-1.0~svn3827/debian/changelog clanlib-1.0~svn3827/debian/changelog
--- clanlib-1.0~svn3827/debian/changelog	2017-07-26 01:21:28.000000000 +0200
+++ clanlib-1.0~svn3827/debian/changelog	2018-10-17 19:36:24.000000000 +0200
@@ -1,3 +1,11 @@
+clanlib (1.0~svn3827-7.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Let dh_auto_configure pass a multiarch --libdir to ./configure.
+    (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 17 Oct 2018 19:36:24 +0200
+
 clanlib (1.0~svn3827-7) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru clanlib-1.0~svn3827/debian/libclanapp-1.0v5.install clanlib-1.0~svn3827/debian/libclanapp-1.0v5.install
--- clanlib-1.0~svn3827/debian/libclanapp-1.0v5.install	2017-07-26 01:21:28.000000000 +0200
+++ clanlib-1.0~svn3827/debian/libclanapp-1.0v5.install	2018-10-17 19:36:24.000000000 +0200
@@ -1,11 +1,11 @@
-usr/lib/libclanApp*.so.*
-usr/lib/libclanCore*.so.*
-usr/lib/libclanDisplay*.so.*
-usr/lib/libclanGL*.so.*
-usr/lib/libclanGUI*.so.*
-usr/lib/libclanGUIStyleSilver*.so.*
-usr/lib/libclanMikMod*.so.*
-usr/lib/libclanNetwork*.so.*
-usr/lib/libclanSignals*.so.*
-usr/lib/libclanSound*.so.*
-usr/lib/libclanVorbis*.so.*
+usr/lib/*/libclanApp*.so.*
+usr/lib/*/libclanCore*.so.*
+usr/lib/*/libclanDisplay*.so.*
+usr/lib/*/libclanGL*.so.*
+usr/lib/*/libclanGUI*.so.*
+usr/lib/*/libclanGUIStyleSilver*.so.*
+usr/lib/*/libclanMikMod*.so.*
+usr/lib/*/libclanNetwork*.so.*
+usr/lib/*/libclanSignals*.so.*
+usr/lib/*/libclanSound*.so.*
+usr/lib/*/libclanVorbis*.so.*
diff --minimal -Nru clanlib-1.0~svn3827/debian/libclanlib-dev.install clanlib-1.0~svn3827/debian/libclanlib-dev.install
--- clanlib-1.0~svn3827/debian/libclanlib-dev.install	2017-07-26 01:21:28.000000000 +0200
+++ clanlib-1.0~svn3827/debian/libclanlib-dev.install	2018-10-17 19:36:24.000000000 +0200
@@ -1,4 +1,4 @@
 usr/include
-usr/lib/libclan*.so
-usr/lib/libclan*.a
-usr/lib/pkgconfig
+usr/lib/*/libclan*.so
+usr/lib/*/libclan*.a
+usr/lib/*/pkgconfig
diff --minimal -Nru clanlib-1.0~svn3827/debian/libclansdl-1.0v5.install clanlib-1.0~svn3827/debian/libclansdl-1.0v5.install
--- clanlib-1.0~svn3827/debian/libclansdl-1.0v5.install	2017-07-26 01:21:28.000000000 +0200
+++ clanlib-1.0~svn3827/debian/libclansdl-1.0v5.install	2018-10-17 19:36:24.000000000 +0200
@@ -1 +1 @@
-usr/lib/libclanSDL*.so.*
+usr/lib/*/libclanSDL*.so.*
diff --minimal -Nru clanlib-1.0~svn3827/debian/rules clanlib-1.0~svn3827/debian/rules
--- clanlib-1.0~svn3827/debian/rules	2017-07-26 01:21:28.000000000 +0200
+++ clanlib-1.0~svn3827/debian/rules	2018-10-17 19:36:24.000000000 +0200
@@ -27,14 +27,13 @@
 	--enable-clansound --enable-lua --enable-network --enable-dyn \
 	--enable-vidmode --disable-smalljpeg --disable-debug          \
 	--enable-asm386=$(use_asm386)                                 \
-	--x-includes=/usr/include/X11                                 \
-	--prefix=/usr --mandir=/usr/share/man
+	--x-includes=/usr/include/X11
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" ./configure $(CONFIG_FLAGS)
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" dh_auto_configure -- $(CONFIG_FLAGS)
 
 override_dh_auto_clean:
 	dh_auto_clean