[Debian-med-packaging] Bug#859257: libngs-sdk-dev: installs .a files to the incorrect directory

[Graham Inggs]

After filing #859260 and #859261, I looked at this again.
The attached patch uses DEB_HOST_MULTIARCH instead of
DEB_BUILD_GNU_TYPE throughout debian/rules.
-------------- next part --------------
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,9 @@
 
 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)/$(BUILDTYPE)/$(DEBPKGNAME)/$(OS)/gcc/*
+SODIR := $(DEBPKGNAME)/$(MULTIARCH)/$(DEBPKGNAME)/$(OS)/gcc/*
 
 build2vers := $(shell pyversions -sv)
 build3vers := $(shell py3versions -sv)
@@ -23,19 +23,19 @@
 	#    dh_auto_clean --sourcedirectory=$(DEBPKGNAME) ; \
 	dh_auto_clean ; \
 	fi
-	rm -rf ngs-java/$(BUILDTYPE)
-	rm -rf ngs-bam/$(BUILDTYPE)
+	rm -rf ngs-java/$(MULTIARCH)
+	rm -rf ngs-bam/$(MULTIARCH)
 	rm -f ngs-bam/Makefile.config
 	rm -f ngs-bam/Makefile.config.install.linux.x86_64.prl
 	rm -f ngs-bam/Makefile.config.linux.x86_64
 	rm -f ngs-bam/reconfigure
 
-	rm -rf $(DEBPKGNAME)/$(BUILDTYPE)
+	rm -rf $(DEBPKGNAME)/$(MULTIARCH)
 	rm -rf ngs-python/build
 
 override_dh_auto_configure:
 	# # that's no standard configure script lacking support of default options \
-	./configure --build=$(BUILDTYPE) --prefix=/usr -- --source=1.7
+	./configure --build=$(MULTIARCH) --prefix=/usr -- --source=1.7
 
 override_dh_auto_build:
 	#dh_auto_build --sourcedirectory=$(DEBPKGNAME)
@@ -43,7 +43,7 @@
 	dh_auto_build --sourcedirectory=$(DEBPKGNAME)
 	# Remove ngs-bam generation, expects ngs-sdk and cannot find a way
 	# to specify it
-	#cd ngs-bam && LD_LIBRARY_PATH=../$(SODIR)/rel/lib ./configure --build=$(BUILDTYPE) --prefix=/usr --with-ngs-sdk-prefix=../ngs-sdk
+	#cd ngs-bam && LD_LIBRARY_PATH=../$(SODIR)/rel/lib ./configure --build=$(MULTIARCH) --prefix=/usr --with-ngs-sdk-prefix=../ngs-sdk
 	#dh_auto_build --sourcedirectory=ngs-bam
 	dh_auto_build --sourcedirectory=ngs-java -- JAVAC="javac -source 1.7 -target 1.7"
 	markdown_py -f README.html README.md
@@ -52,8 +52,8 @@
 	make -C $(DEBPKGNAME)/test
 	# Tests of Java binding disabled because need external lib ncbi-vdb,
 	# not available in Debian at this time
-	#CLASSPATH=../$(BUILDTYPE)/ngs-java/jar/ngs-java.jar LD_LIBRARY_PATH=$(SODIR)/rel/lib:$(LD_LIBRARY_PATH) make -C ngs-java/examples
-	#CLASSPATH=../$(BUILDTYPE)/ngs-java/jar/ngs-java.jar LD_LIBRARY_PATH=../../$(SODIR)/rel/lib:$(LD_LIBRARY_PATH) make -C ngs-java/examples run_all
+	#CLASSPATH=../$(MULTIARCH)/ngs-java/jar/ngs-java.jar LD_LIBRARY_PATH=$(SODIR)/rel/lib:$(LD_LIBRARY_PATH) make -C ngs-java/examples
+	#CLASSPATH=../$(MULTIARCH)/ngs-java/jar/ngs-java.jar LD_LIBRARY_PATH=../../$(SODIR)/rel/lib:$(LD_LIBRARY_PATH) make -C ngs-java/examples run_all
 
 override_dh_auto_install:
 	d-shlibmove --commit \
@@ -61,8 +61,8 @@
 		    --devunversioned \
 		    --exclude-a \
 		    --exclude-la \
-		    --movedev "$(SODIR)/rel/lib/*.a*" usr/lib/$(BUILDTYPE) \
-		    --movedev "$(SODIR)/rel/ilib/*.a" usr/lib/$(BUILDTYPE) \
+		    --movedev "$(SODIR)/rel/lib/*.a*" usr/lib/$(MULTIARCH) \
+		    --movedev "$(SODIR)/rel/ilib/*.a" usr/lib/$(MULTIARCH) \
 		    --movedev ngs-sdk/ngs usr/include \
 		    $(SODIR)/rel/lib/libngs-sdk.so