DEB libcarddav: Add definitions for multi-arch.

CMAKE_INSTALL_LIBDIR is set independently of GNUInstallDirs.

Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 52581ba1881a5d9441ec9a618f9a725442f6a809)

2 files changed, 9 insertions, 0 deletions

diff --git a/debian/_base/dependencies/libcarddav/debian/control b/debian/_base/dependencies/libcarddav/debian/control
index 961e1f94d..a7ceea5fd 100644
--- a/debian/_base/dependencies/libcarddav/debian/control
+++ b/debian/_base/dependencies/libcarddav/debian/control
@@ -7,6 +7,7 @@ Standards-Version: 3.8.4
 
 Package: libcarddav
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}
 Description: 
@@ -14,6 +15,7 @@ Description:
 
 Package: libcarddav-dev
 Architecture: any
+Multi-Arch: foreign
 Section: libdevel
 Depends: libcarddav (= ${binary:Version})
 Description: 
diff --git a/debian/_base/dependencies/libcarddav/debian/rules b/debian/_base/dependencies/libcarddav/debian/rules
index 56e8f5415..c75240154 100755
--- a/debian/_base/dependencies/libcarddav/debian/rules
+++ b/debian/_base/dependencies/libcarddav/debian/rules
@@ -7,9 +7,16 @@ include debian/cdbs/debian-tde.mk
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
+ifdef DEB_HOST_MULTIARCH
+  CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+  CMAKE_INSTALL_LIBDIR = lib
+endif
+
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
  -DWITH_ALL_OPTIONS="ON" \
  -DBUILD_ALL="ON"