diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-05-05 16:47:12 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-05-05 16:47:12 +0000 |
| commit | c7ff8b1ba190fa902f1796ed266af174d31a11e6 (patch) | |
| tree | afac2433a42eab17df5b1fb15dfdf8a703f6de60 /mk/java-vm.mk | |
| parent | d30c3d018c2ff892375b19d7ee9e1d05210ce015 (diff) | |
| download | pkgsrc-c7ff8b1ba190fa902f1796ed266af174d31a11e6.tar.gz | |
Make sure buildlink3 file exists before trying to use it.
Diffstat (limited to 'mk/java-vm.mk')
| -rw-r--r-- | mk/java-vm.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 0fe16fd98fd..ef60e49d791 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.24 2004/05/02 20:30:44 xtraeme Exp $ +# $NetBSD: java-vm.mk,v 1.25 2004/05/05 16:47:12 xtraeme Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -262,7 +262,9 @@ EVAL_PREFIX+= _JAVA_HOME=${_JAVA_PKGBASE.${_PKG_JVM}} . if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) . include "${_JRE_PKGSRCDIR}/buildlink2.mk" . elif defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[Nn][Oo]) -. include "${_JRE_PKGSRCDIR}/buildlink3.mk" +. if exists(${_JRE_PKGSRCDIR}/buildlink3.mk) +. include "${_JRE_PKGSRCDIR}/buildlink3.mk" +. endif . else DEPENDS+= ${_JRE_DEPENDENCY} . endif @@ -276,7 +278,9 @@ DEPENDS+= ${_JRE_DEPENDENCY} . if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO]) . include "${_JDK_PKGSRCDIR}/buildlink2.mk" . elif defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[Nn][Oo]) -. include "${_JDK_PKGSRCDIR}/buildlink3.mk" +. if exists(${_JDK_PKGSRCDIR}/buildlink3.mk) +. include "${_JDK_PKGSRCDIR}/buildlink3.mk" +. endif . else BUILD_DEPENDS+= ${_JDK_DEPENDENCY} . endif |