From 950e6fee89d99a20883ebf7f3595b7eaa01531e7 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 28 Dec 2002 19:53:57 +0000
Subject: Check whether USE_BUILDLINK2 is defined before testing its value.

---
 mk/java-vm.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mk')

diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index f9ee33e9064..f31f719832f 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.1 2002/12/26 20:52:14 jlam Exp $
+# $NetBSD: java-vm.mk,v 1.2 2002/12/28 19:53:57 jlam Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -218,7 +218,7 @@ _JDK_DEPENDENCY?=	${BUILDLINK_DEPENDS.${_PKG_JVM}}:${_JDK_PKGSRCDIR}
 EVAL_PREFIX+=		_JAVA_HOME=${_JAVA_PKGBASE.${_PKG_JVM}}
 
 # We always need a run-time dependency on the JRE.
-.if empty(USE_BUILDLINK2:M[nN][oO])
+.if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])
 .  include "${_JRE_PKGSRCDIR}/buildlink2.mk"
 .else
 DEPENDS+=		${_JRE_DEPENDENCY}
@@ -228,7 +228,7 @@ DEPENDS+=		${_JRE_DEPENDENCY}
 # the JDK.
 #
 .if ${USE_JAVA} != "run"
-.  if empty(USE_BUILDLINK2:M[nN][oO])
+.  if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])
 .    include "${_JDK_PKGSRCDIR}/buildlink2.mk"
 .  else
 BUILD_DEPENDS+=		${_JDK_DEPENDENCY}
-- 
cgit v1.2.3