[med-svn] [ncbi-vdb] 01/03: Fix build

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ncbi-vdb.

commit 299e0a089c6b1b1d52ab98c8a419ea04c3426ef8
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 1 11:39:49 2016 +0200

    Fix build
---
 debian/changelog | 6 ++++++
 debian/rules     | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index faca4ff..551be10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ncbi-vdb (2.7.0+dfsg-3) unstable; urgency=medium
+
+  * Fix build on i386 (Thanks to Aaron M. Ucko for the hint)
+
+ -- Andreas Tille <tille at debian.org>  Thu, 01 Sep 2016 09:37:50 +0200
+
 ncbi-vdb (2.7.0+dfsg-2) unstable; urgency=medium
 
   * Enable build on x32 by removing explicit -m32/-m64
diff --git a/debian/rules b/debian/rules
index bef6471..626ec17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,8 @@ CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
 BUILDTYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 # since build-results are not ending up in the proper dir its saver to use "*" instead of "$(CPU)"
 SODIR := $(DEBPKGNAME)/$(DEBPKGNAME)/$(OS)/gcc
-LIBINSTALLDIR := debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(CPU)/dbg/lib
+VDB_ARCH := $(word 1, $(subst -, ,$(DEB_HOST_MULTIARCH)))
+LIBINSTALLDIR := debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/$(VDB_ARCH)/dbg/lib
 LIBPKG := libncbi-vdb2
 SCHEMADIR := debian/$(LIBPKG)/usr/lib/$(DEBPKGNAME)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ncbi-vdb.git