diff options
author | dmcmahill <dmcmahill@pkgsrc.org> | 2003-02-06 23:44:07 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill@pkgsrc.org> | 2003-02-06 23:44:07 +0000 |
commit | cbca7b060432725217ed512fd61b7f04ae51cdf8 (patch) | |
tree | 93c59cbf0295864d1b416bf5dca1bc0440af515c /mk | |
parent | c5933d9f8e1b56ba1b46a77de78ea542db7b82b4 (diff) | |
download | pkgsrc-cbca7b060432725217ed512fd61b7f04ae51cdf8.tar.gz |
make this also behave correctly when USE_BUILDLINK2 is not defined as well as _JRE_PKGSRCDIR not being defined
Diffstat (limited to 'mk')
-rw-r--r-- | mk/java-vm.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 0bdf0700626..8fc7eb9fdd7 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.9 2003/02/06 23:25:25 dmcmahill Exp $ +# $NetBSD: java-vm.mk,v 1.10 2003/02/06 23:44:07 dmcmahill Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -235,11 +235,13 @@ _JRE_DEPENDENCY?= ${BUILDLINK_DEPENDS.${_JRE.${_PKG_JVM}}}:${_JRE_PKGSRCDIR} EVAL_PREFIX+= _JAVA_HOME=${_JAVA_PKGBASE.${_PKG_JVM}} # We always need a run-time dependency on the JRE. -.if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) && defined(_JRE_PKGSRCDIR) +.if defined(_JRE_PKGSRCDIR) +.if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) . include "${_JRE_PKGSRCDIR}/buildlink2.mk" .else DEPENDS+= ${_JRE_DEPENDENCY} .endif +.endif # If we are building Java software, then we need a build-time dependency on # the JDK. |