diff options
| author | tv <tv@pkgsrc.org> | 2005-02-11 16:36:49 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-02-11 16:36:49 +0000 |
| commit | 614ff3079034f3d2a8b35fbb196b8d7600b56ea2 (patch) | |
| tree | 18e5e8f3747e265b6788ea29f849dfe42759e1eb /mk/java-vm.mk | |
| parent | 4c2cccef33de929aec468cf6aac5a94d8c0bcf1e (diff) | |
| download | pkgsrc-614ff3079034f3d2a8b35fbb196b8d7600b56ea2.tar.gz | |
Visual cleanup from tv-derecurse:
Consolidate many MAKE_ENVs and SCRIPTS_ENVs into a common block.
(CONFIGURE_ENVs to be done later.)
Introduce new variable ALL_ENV which is automatically included into all
of MAKE_ENV, SCRIPTS_ENV, and CONFIGURE_ENV; this allows much cleaner
addition of the common CC/CXX/CFLAGS/etc. variables needed by all of these.
Diffstat (limited to 'mk/java-vm.mk')
| -rw-r--r-- | mk/java-vm.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index a970145bb21..7afc83010da 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.37 2005/01/24 19:32:33 tv Exp $ +# $NetBSD: java-vm.mk,v 1.38 2005/02/11 16:36:49 tv Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -324,9 +324,8 @@ CLASSPATH_cmd= ${ECHO} `for p in \ 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} +ALL_ENV+= CLASSPATH=${CLASSPATH:Q} +ALL_ENV+= JAVA_HOME=${PKG_JAVA_HOME} BUILD_DEFS+= PKG_JVM PKG_JAVA_HOME MAKEFLAGS+= PKG_JVM=${PKG_JVM} PREPEND_PATH+= ${PKG_JAVA_HOME}/bin |