diff options
| author | Emmanuel Bourg <ebourg@apache.org> | 2015-10-08 09:13:10 +0200 |
|---|---|---|
| committer | Emmanuel Bourg <ebourg@apache.org> | 2015-10-08 09:13:10 +0200 |
| commit | 63a51d59c3568f7149379e7bfa085c706e5be4e7 (patch) | |
| tree | fced6933b8ca03358241ac7b93a1aa321df46a7f | |
| parent | af04237130f6d1d1fce386034b59d313403b0b67 (diff) | |
| download | java-common-63a51d59c3568f7149379e7bfa085c706e5be4e7.tar.gz | |
Use 'dpkg-architecture --query' instead of make filters in debian/rules
| -rwxr-xr-x | debian/rules | 6 |
1 files 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 |