diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/java_defaults.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 712d18b..34e5ec3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ java-common (0.57) UNRELEASED; urgency=medium * Build a default-jdk-headless package. + * java_defaults.mk: Fix jvm_archdir macro (Jonas Smedegaard). Closes: #814783. -- Matthias Klose <doko@debian.org> Thu, 25 Feb 2016 02:45:18 +0100 diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk index 3cb94ba..3a25ccd 100644 --- a/debian/java_defaults.mk +++ b/debian/java_defaults.mk @@ -47,7 +47,7 @@ jvm_archdir_map = \ sparc=sparc sparc64=sparc64 sh4=sh s390x=s390x ia64=ia64 x32=x32 jvm_archdir := \ - $(strip $(patsubst $(_java_host_cpu)=%, %, $(filter $(_java_host_cpu)=%, $(jvm_arch_map)))) + $(strip $(patsubst $(_java_host_cpu)=%, %, $(filter $(_java_host_cpu)=%, $(jvm_archdir_map)))) ifneq (,$(filter $(java_default_version), 9)) jvm_archpath := lib/$(jvm_archdir) |