diff options
| author | tron <tron@pkgsrc.org> | 2004-06-09 08:20:22 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2004-06-09 08:20:22 +0000 |
| commit | d669151c272525eb1b6714187de3e1c552e53c55 (patch) | |
| tree | a4ba8ab97129a8a9ec05de613ee2ef5ac4a832db | |
| parent | 44080a0f62c891f034dd1fb7e2b598d0adb7d20e (diff) | |
| download | pkgsrc-d669151c272525eb1b6714187de3e1c552e53c55.tar.gz | |
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.
| -rw-r--r-- | mk/java-vm.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 793278c5b39..574daa87d08 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -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 @@ SCRIPTS_ENV+= JAVAC="jikes" _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) |