pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Let a package specify which is the real binary for ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8b901e318b80
branches:  trunk
changeset: 475679:8b901e318b80
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun May 23 10:19:28 2004 +0000

description:
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:

 mk/java-env.mk |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 7d390a66fde1 -r 8b901e318b80 mk/java-env.mk
--- a/mk/java-env.mk    Sun May 23 04:07:41 2004 +0000
+++ b/mk/java-env.mk    Sun May 23 10:19:28 2004 +0000
@@ -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 @@
 
 .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 @@
        @${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}:



Home | Main Index | Thread Index | Old Index