diff options
| author | jlam <jlam> | 2002-12-28 19:53:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-12-28 19:53:57 +0000 |
| commit | 950e6fee89d99a20883ebf7f3595b7eaa01531e7 (patch) | |
| tree | f643948318dae7741d38ecb96b92b9c922c80481 /mk | |
| parent | e82d2738d2a4066529448090145f5caef3d96e90 (diff) | |
| download | pkgsrc-950e6fee89d99a20883ebf7f3595b7eaa01531e7.tar.gz | |
Check whether USE_BUILDLINK2 is defined before testing its value.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/java-vm.mk | 6 |
1 files changed, 3 insertions, 3 deletions
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} |