[SCM] kodiplatform/master: Install CMake and pkg-config files to multiarch dir

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 872b3a5534756e4aba455bf17c09e2ce3d924c6b
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed Sep 9 20:16:52 2015 +0200

    Install CMake and pkg-config files to multiarch dir

diff --git a/debian/libkodiplatform-dev.install b/debian/libkodiplatform-dev.install
index 6db139d..c579a4b 100644
--- a/debian/libkodiplatform-dev.install
+++ b/debian/libkodiplatform-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
 usr/lib/*/*.so
-usr/lib/pkgconfig/*.pc
-usr/lib/kodiplatform/*
+usr/lib/*/pkgconfig/*.pc
+usr/lib/*/kodiplatform/*
diff --git a/debian/patches/02_fix-noarch-libdir-usage.patch b/debian/patches/02_fix-noarch-libdir-usage.patch
new file mode 100644
index 0000000..d864e0a
--- /dev/null
+++ b/debian/patches/02_fix-noarch-libdir-usage.patch
@@ -0,0 +1,26 @@
+Description: Stop using CMAKE_INSTALL_LIBDIR_NOARCH
+ Both pkg-config and .cmake files contain the multiarch path
+ which makes them different on each arch. They should reside
+ in the multiarch libdirs.
+ .
+Author: Balint Reczey <balint at balintreczey.hu>
+
+--- kodiplatform-16.0.0.orig/CMakeLists.txt
++++ kodiplatform-16.0.0/CMakeLists.txt
+@@ -57,14 +57,14 @@ IF(NOT WIN32)
+                                  ${CMAKE_INSTALL_PREFIX}/include)
+ 
+   install(FILES ${CMAKE_BINARY_DIR}/kodiplatform.pc
+-          DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/pkgconfig)
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ ENDIF(NOT WIN32)
+ 
+ # config mode
+ configure_file (kodiplatform-config.cmake.in
+                 kodiplatform-config.cmake @ONLY)
+ install(FILES ${CMAKE_BINARY_DIR}/kodiplatform-config.cmake
+-        DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/kodiplatform)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/kodiplatform)
+ 
+ # Quell warnings with in-tree builds
+ set(KODI_BUILD_DIR ${KODI_BUILD_DIR})
diff --git a/debian/patches/series b/debian/patches/series
index d6fa0e7..f9774b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_use_cec-platform.patch
+02_fix-noarch-libdir-usage.patch

-- 
kodiplatform packaging