diff options
author | jlam <jlam> | 2002-10-14 07:25:04 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-10-14 07:25:04 +0000 |
commit | 30ce69e4e9279db42990b4a0cd66e1fa001313da (patch) | |
tree | 12b32ad1a7d275679b995b24ebe264bb0685154d | |
parent | 2fcd44832d3ff10534dec379ac6af66d81048c6b (diff) | |
download | pkgsrc-30ce69e4e9279db42990b4a0cd66e1fa001313da.tar.gz |
Fix typo (missing leading underscore), and add a currently unreachable
section that errors out if there is no acceptable JVM found.
-rw-r--r-- | mk/java.mk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mk/java.mk b/mk/java.mk index 369aac1b13d..d0e57fdd866 100644 --- a/mk/java.mk +++ b/mk/java.mk @@ -1,4 +1,4 @@ -# $NetBSD: java.mk,v 1.1 2002/10/13 09:29:12 jlam Exp $ +# $NetBSD: java.mk,v 1.2 2002/10/14 07:25:04 jlam Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -133,7 +133,16 @@ _PKG_JVM= ${_PKG_JVM_DEFAULT} # ...otherwise, just use the first accepted JVM. # .if !defined(_PKG_JVM) -_PKG_JVM= ${PKG_JVM_FIRSTACCEPTED} +. if defined(_PKG_JVM_FIRSTACCEPTED) +_PKG_JVM= ${_PKG_JVM_FIRSTACCEPTED} +. endif +.endif +# +# If there are no acceptable JVMs, then generate an error. +# +.if !defined(_PKG_JVM) +# force an error + error: no acceptable JVM found .endif BUILDLINK_DEPENDS.jdk?= jdk-[0-9]* |