[pkgsrc/trunk]: pkgsrc/mk Use "_JAVA_HOME_DEFAULT" if it is defined instead o...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/74fe8afc57b1
branches:  trunk
changeset: 476392:74fe8afc57b1
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Jun 09 08:20:22 2004 +0000

description:
Use "_JAVA_HOME_DEFAULT" if it is defined instead of using "EVAL_PREFIX".
The later usually returns "${LOCALBASE}" which isn't useful for most of
the packages providing a JVM.

diffstat:

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

diffs (21 lines):

diff -r 5df079c56db6 -r 74fe8afc57b1 mk/java-vm.mk
--- a/mk/java-vm.mk     Wed Jun 09 05:42:31 2004 +0000
+++ b/mk/java-vm.mk     Wed Jun 09 08:20:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.26 2004/06/03 20:19:08 abs Exp $
+# $NetBSD: java-vm.mk,v 1.27 2004/06/09 08:20:22 tron Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -264,7 +264,11 @@
 _JDK_DEPENDENCY?=      ${BUILDLINK_DEPENDS.${_PKG_JVM}}:${_JDK_PKGSRCDIR}
 _JRE_DEPENDENCY?=      ${BUILDLINK_DEPENDS.${_JRE.${_PKG_JVM}}}:${_JRE_PKGSRCDIR}
 
+.if defined(_JAVA_HOME_DEFAULT)
+_JAVA_HOME=            ${_JAVA_HOME_DEFAULT}
+.else
 EVAL_PREFIX+=          _JAVA_HOME=${_JAVA_PKGBASE.${_PKG_JVM}}
+.endif
 
 # We always need a run-time dependency on the JRE.
 .if defined(_JRE_PKGSRCDIR)