summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2003-02-06 23:25:25 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2003-02-06 23:25:25 +0000
commitb83dd54045610db9d14fe6e20418e8e2e831f393 (patch)
tree28cef7814708aa77da21cf6d77798621832688ce /mk
parent962b8f608663c3a0ef1ad9115f4032068c71e3fe (diff)
downloadpkgsrc-b83dd54045610db9d14fe6e20418e8e2e831f393.tar.gz
only include _JRE_PKGSRCDIR/buildlink2.mk if it exists (allowing things like
make show-var VARNAME=PKGNAME to work on systems without a JVM.
Diffstat (limited to 'mk')
-rw-r--r--mk/java-vm.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index c9750e7a0d1..0bdf0700626 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.8 2003/02/06 10:17:38 dmcmahill Exp $
+# $NetBSD: java-vm.mk,v 1.9 2003/02/06 23:25:25 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,7 +235,7 @@ _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])
+.if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) && defined(_JRE_PKGSRCDIR)
. include "${_JRE_PKGSRCDIR}/buildlink2.mk"
.else
DEPENDS+= ${_JRE_DEPENDENCY}