From fade3ef79d6c85d40c378e2d2dc7b2f962cc44ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 19 Jan 2017 16:22:34 +0100 Subject: [PATCH] update lib paths for multiarch support --- debian/libguh1-dev.dirs | 2 +- debian/libguh1-dev.install | 2 +- debian/libguh1.dirs | 1 + debian/libguh1.install | 6 +++--- debian/rules | 2 ++ 5 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 debian/libguh1.dirs diff --git a/debian/libguh1-dev.dirs b/debian/libguh1-dev.dirs index f317954b..39326de9 100644 --- a/debian/libguh1-dev.dirs +++ b/debian/libguh1-dev.dirs @@ -1,2 +1,2 @@ -usr/lib +usr/lib/* usr/include/guh diff --git a/debian/libguh1-dev.install b/debian/libguh1-dev.install index 7e9c9e5e..c8bd6471 100644 --- a/debian/libguh1-dev.install +++ b/debian/libguh1-dev.install @@ -1,4 +1,4 @@ -usr/lib/libguh.so +usr/lib/*/libguh.so usr/include/guh/* usr/include/guh usr/bin/guh-generateplugininfo usr/bin diff --git a/debian/libguh1.dirs b/debian/libguh1.dirs new file mode 100644 index 00000000..f1d0181f --- /dev/null +++ b/debian/libguh1.dirs @@ -0,0 +1 @@ +usr/lib/* diff --git a/debian/libguh1.install b/debian/libguh1.install index 659faf7a..b4315226 100644 --- a/debian/libguh1.install +++ b/debian/libguh1.install @@ -1,3 +1,3 @@ -usr/lib/libguh.so.1 -usr/lib/libguh.so.1.0 -usr/lib/libguh.so.1.0.0 +usr/lib/*/libguh.so.1 +usr/lib/*/libguh.so.1.0 +usr/lib/*/libguh.so.1.0.0 diff --git a/debian/rules b/debian/rules index 0a67cb23..26e9a5de 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,8 @@ else endif DPKG_EXPORT_BUILDFLAGS = 1 +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + include /usr/share/dpkg/buildflags.mk %: