From 7aa73ae3084b66108b4338caef1275ced7ebb8ea Mon Sep 17 00:00:00 2001 From: jmmv Date: Sun, 23 May 2004 10:19:28 +0000 Subject: Let a package specify which is the real binary for each wrapper (by setting JAVA_WRAPPER_BIN.), 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. --- mk/java-env.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mk/java-env.mk') 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}: -- cgit v1.2.3