Skip to content
Browse files

Let a package specify which is the real binary for each wrapper (by s…

…etting

JAVA_WRAPPER_BIN.<wrapper-name>), in case it differs from the default.
For example, sablevm does not install a 'java' program with that name, so
adding 'java' to JAVA_WRAPPERS couldn't DTRT.
  • Loading branch information...
1 parent 2ca9478 commit 1d8abe83836f142a14a3498cdc0c733f85e415bc jmmv committed May 23, 2004
Showing with 4 additions and 2 deletions.
  1. +4 −2 mk/java-env.mk
View
6 mk/java-env.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-env.mk,v 1.1 2004/05/22 21:13:17 jmmv Exp $
+# $NetBSD: java-env.mk,v 1.2 2004/05/23 10:19:28 jmmv Exp $
#
# This Makefile fragment handles Java wrappers and is meant to be included
# by packages that provide a Java build-time and/or run-time environment.
@@ -37,6 +37,8 @@ JAVA_WRAPPERS?= # empty
.for w in ${JAVA_WRAPPERS}
+JAVA_WRAPPER_BIN.${w}?= ${JAVA_HOME}/bin/${w}
+
post-build: ${WRKDIR}/${w}
.PHONY: install-java-wrapper-${w}
@@ -57,7 +59,7 @@ ${WRKDIR}/${w}:
@${ECHO} '${ULIMIT_CMD_${f}}' >>${WRKDIR}/${w}
. endfor
. undef f
- @${ECHO} '${JAVA_HOME}/bin/${w} "$$@"' >>${WRKDIR}/${w}
+ @${ECHO} '${JAVA_WRAPPER_BIN.${w}} "$$@"' >>${WRKDIR}/${w}
. endif
install-java-wrapper-${w}:

0 comments on commit 1d8abe8

Please sign in to comment.
Something went wrong with that request. Please try again.