pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Make sure buildlink3 file exists before trying to u...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/59b3235b8390
branches:  trunk
changeset: 474812:59b3235b8390
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed May 05 16:47:12 2004 +0000

description:
Make sure buildlink3 file exists before trying to use it.

diffstat:

 mk/java-vm.mk |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r d803d38e11f0 -r 59b3235b8390 mk/java-vm.mk
--- a/mk/java-vm.mk     Wed May 05 16:40:30 2004 +0000
+++ b/mk/java-vm.mk     Wed May 05 16:47:12 2004 +0000
@@ -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 @@
 .  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 @@
 .    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



Home | Main Index | Thread Index | Old Index