[med-svn] [ncbi-vdb] 01/02: Apply patch by Graham Inggs

[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 e5395d22bd6242d3050f53a52bda6ef11c9fc1dc
Author: Andreas Tille <tille at debian.org>
Date:   Sat Apr 1 22:50:27 2017 +0200

    Apply patch by Graham Inggs
---
 debian/rules | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/rules b/debian/rules
index 5e80ad5..5ab8d57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 
 OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-BUILDTYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 # since build-results are not ending up in the proper dir its saver to use "*" instead of "$(CPU)"
 SODIR := $(DEBPKGNAME)/$(DEBPKGNAME)/$(OS)/gcc
 VDB_ARCH := $(word 1, $(subst -, ,$(DEB_HOST_MULTIARCH)))
@@ -25,7 +25,7 @@ override_dh_auto_clean:
 	if [ -e ngs-sdk/Makefile.config.$(OS).$(CPU) ] ; then \
 		dh_auto_clean ; \
 	fi
-	rm -rf $(DEBPKGNAME)/$(BUILDTYPE)
+	rm -rf $(DEBPKGNAME)/$(MULTIARCH)
 
 override_dh_auto_configure:
 	# that's no standard configure script lacking support of default options
@@ -34,7 +34,7 @@ override_dh_auto_configure:
 	# so we need to go with patches.  The options are specified anyway.
 	ln -s /usr/lib/jvm/default-java/include/jni.h		libs/ngs-jni
 	ln -s /usr/lib/jvm/default-java/include/linux/jni_md.h	libs/ngs-jni
-	./configure --build=$(BUILDTYPE) --prefix=/usr --build-prefix=$(CURDIR)/debian/tmp/usr --with-ngs-sdk-prefix=/usr --with-debug --with-ngs-java-prefix=/usr/share/java
+	./configure --build=$(MULTIARCH) --prefix=/usr --build-prefix=$(CURDIR)/debian/tmp/usr --with-ngs-sdk-prefix=/usr --with-debug --with-ngs-java-prefix=/usr/share/java
 	# no idea how to convince configure script to use the correct include dir so patching result afterwards
 	sed -i 's?HDF5_INCDIR = /usr/include?&/hdf5/serial?' build/Makefile.config*
 
@@ -61,16 +61,16 @@ override_dh_auto_install:
 		    --override s/libmbedcrypto0-dev/libmbedtls-dev/ \
 		    --override s/libmbedtls10-dev/libmbedtls-dev/ \
 		    --override s/libmbedx509-0-dev/libmbedtls-dev/ \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libncbi-ngs-c++.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp-norsrc.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkff.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libktst.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkxfs.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkxml.a usr/lib/$(BUILDTYPE) \
-                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libload.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libtui.a usr/lib/$(BUILDTYPE) \
-                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libtui_cpp.a usr/lib/$(BUILDTYPE) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libncbi-ngs-c++.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp-norsrc.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkff.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libktst.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkxfs.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkxml.a usr/lib/$(MULTIARCH) \
+                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libload.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libtui.a usr/lib/$(MULTIARCH) \
+                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libtui_cpp.a usr/lib/$(MULTIARCH) \
 		    --movedev interfaces usr/include \
 		    debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libncbi-vdb.so
 	mv debian/libncbi-vdb-dev/usr/include/interfaces debian/libncbi-vdb-dev/usr/include/$(DEBPKGNAME)

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