diff options
| author | tv <tv@pkgsrc.org> | 2005-01-24 19:32:33 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-01-24 19:32:33 +0000 |
| commit | 3c440a0121f9f643c43ee66fa4548b68a3f9e343 (patch) | |
| tree | ebd5ab9e92c966051c8b18e0c6df1c4226ec5e29 /mk/java-vm.mk | |
| parent | 20fc0a5a49d431eeddc48e02c1ada255463b476a (diff) | |
| download | pkgsrc-3c440a0121f9f643c43ee66fa4548b68a3f9e343.tar.gz | |
Merge down deferred PREPEND_PATH handling from the tv-derecurse branch.
Also merge in deferred CLASSPATH handling, which can now be moved back
to java-vm.mk for cleanliness.
Diffstat (limited to 'mk/java-vm.mk')
| -rw-r--r-- | mk/java-vm.mk | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index f0590cb0cb1..a970145bb21 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.36 2005/01/12 17:23:46 tv Exp $ +# $NetBSD: java-vm.mk,v 1.37 2005/01/24 19:32:33 tv Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -315,12 +315,20 @@ PKG_JAVA_HOME?= ${BUILDLINK_JAVA_PREFIX.${_PKG_JVM}} .else PKG_JAVA_HOME?= ${_JAVA_HOME} .endif +.if !defined(CLASSPATH) +CLASSPATH_cmd= ${ECHO} `for p in \ + ${PKG_JAVA_HOME}/lib/${_JAVA_BASE_CLASSES} \ + ${PKG_JAVA_HOME}/lib/tools.jar; do \ + ${TEST} ! -f $$p || ${ECHO} $$p; done` \ + . | ${TR} ' ' : +CLASSPATH?= ${CLASSPATH_cmd:sh} +.endif + +CONFIGURE_ENV+= CLASSPATH=${CLASSPATH:Q} JAVA_HOME=${PKG_JAVA_HOME} +MAKE_ENV+= CLASSPATH=${CLASSPATH:Q} JAVA_HOME=${PKG_JAVA_HOME} +SCRIPTS_ENV+= CLASSPATH=${CLASSPATH:Q} JAVA_HOME=${PKG_JAVA_HOME} BUILD_DEFS+= PKG_JVM PKG_JAVA_HOME -PATH:= ${PKG_JAVA_HOME}/bin:${PATH} MAKEFLAGS+= PKG_JVM=${PKG_JVM} - -MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME} -CONFIGURE_ENV+= JAVA_HOME=${PKG_JAVA_HOME} -SCRIPTS_ENV+= JAVA_HOME=${PKG_JAVA_HOME} +PREPEND_PATH+= ${PKG_JAVA_HOME}/bin .endif # JAVA_VM_MK |