summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjmmv <jmmv>2004-05-23 10:19:28 +0000
committerjmmv <jmmv>2004-05-23 10:19:28 +0000
commita99c0f98be3ae926c9898cde66bcc4ddd5d0f06b (patch)
tree7ebdb9771d2c12c1ed1fe87b1cf2cd67f17080fc /mk
parentb551a331b73ed1f6ae81b957d621503364846e0a (diff)
downloadpkgsrc-a99c0f98be3ae926c9898cde66bcc4ddd5d0f06b.tar.gz
Let a package specify which is the real binary for each wrapper (by setting
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.
Diffstat (limited to 'mk')
-rw-r--r--mk/java-env.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/java-env.mk b/mk/java-env.mk
index b9f40d9fdf5..5f6175488ec 100644
--- a/mk/java-env.mk
+++ b/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}: