[Pkg-voip-commits] [libss7] 42/51: install to multiarch paths

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository libss7.

commit d7b5f4697f994fdacb6011220ec427a897174d8e
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Sun Oct 30 08:47:25 2016 +0200

    install to multiarch paths
---
 debian/libss7-2.0.install | 2 +-
 debian/libss7-dev.install | 4 ++--
 debian/rules              | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/libss7-2.0.install b/debian/libss7-2.0.install
index d0dbfd1..3ddde58 100644
--- a/debian/libss7-2.0.install
+++ b/debian/libss7-2.0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libss7-dev.install b/debian/libss7-dev.install
index d1bffed..a3c8f6c 100644
--- a/debian/libss7-dev.install
+++ b/debian/libss7-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
diff --git a/debian/rules b/debian/rules
index fe0462f..3f0fa83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,15 @@ UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e
 UPVERSIONMAJOR:=$(shell echo $(UPVERSION) | sed -re 's/(^[0-9]\.[0-9]).*/\1/')
 SHLIBS = $(PKGNAME) (>= $(UPVERSIONMAJOR))
 
+triplet := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBDIR = /usr/lib/$(triplet)
+
 %:
 	dh $@
 
+override_dh_auto_install:
+	dh_auto_install -- libdir=$(LIBDIR)
+
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/libss7.git