[java-common] 06/09: Use 'dpkg-architecture --query' instead of make filters in debian/rules

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository java-common.

commit 63a51d59c3568f7149379e7bfa085c706e5be4e7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 8 09:13:10 2015 +0200

    Use 'dpkg-architecture --query' instead of make filters in debian/rules
---
 debian/rules | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 3095fdd..38fb5a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,10 @@
 , = ,
 S = $(EMPTY) $(EMPTY)
 mk_cslist = $(subst $(S),$(,)$(S),$(foreach v,$(1),$(v)-$(2)))
-vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
 jrel = $(shell dpkg-parsechangelog | grep -E ^Version: | sed "s/Version: 0.//")
 
-DPKG_VARS := $(shell dpkg-architecture)
-DEB_HOST_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_MULTIARCH)
+DEB_HOST_ARCH      ?= $(shell dpkg-architecture --query DEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
 
 p_jre		= gcj-jre
 p_jhl		= gcj-jre-headless

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