diff options
| author | szptvlfn <szptvlfn@pkgsrc.org> | 2015-03-06 18:28:45 +0000 |
|---|---|---|
| committer | szptvlfn <szptvlfn@pkgsrc.org> | 2015-03-06 18:28:45 +0000 |
| commit | 61f217cfe2866428f5a22f35bde24c7692b0ec34 (patch) | |
| tree | 91544aefa4cc304abb3c65d3472adefefa657f6c /mk | |
| parent | 663b9894a4f8ccc7bd7bf272b89bf6f8c0e52751 (diff) | |
| download | pkgsrc-61f217cfe2866428f5a22f35bde24c7692b0ec34.tar.gz | |
- add OR list operators; \\ -> \
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/java-vm.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index aa8e003e155..fec6d679395 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.100 2015/03/06 12:24:43 tnn Exp $ +# $NetBSD: java-vm.mk,v 1.101 2015/03/06 18:28:45 szptvlfn Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -97,7 +97,7 @@ _PKG_JVM_DEFAULT= ${PKG_JVM_DEFAULT} . if !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-i386) || \ !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64) _PKG_JVM_DEFAULT?= openjdk7 -. elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64) \\ +. elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64) || \ !empty(MACHINE_PLATFORM:MNetBSD-[789].*-earmv[67]hf) _PKG_JVM_DEFAULT?= openjdk8 . elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \ |