diff options
| author | rillig <rillig@pkgsrc.org> | 2006-11-04 21:56:49 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-11-04 21:56:49 +0000 |
| commit | 221e277e283673f78f371d3f179bdb0020763ebc (patch) | |
| tree | b50d74f424aa364365963daaa473b042764cabe6 /mk | |
| parent | 74efb02f37463df6b45c1b359c3c6e933d04ec6a (diff) | |
| download | pkgsrc-221e277e283673f78f371d3f179bdb0020763ebc.tar.gz | |
Since PKG_JVM is not user-settable, it must not be added to BUILD_DEFS.
For that purpose, BUILD_DEFS_EFFECTS has just been introduced.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/java-vm.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 8ff2a739ea6..e955525cd73 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.49 2006/11/04 21:22:30 rillig Exp $ +# $NetBSD: java-vm.mk,v 1.50 2006/11/04 21:56:49 rillig Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -331,7 +331,8 @@ CLASSPATH?= ${CLASSPATH_cmd:sh} ALL_ENV+= CLASSPATH=${CLASSPATH:Q} ALL_ENV+= JAVA_HOME=${PKG_JAVA_HOME} -BUILD_DEFS+= PKG_JVM PKG_JAVA_HOME +BUILD_DEFS+= PKG_JVM_DEFAULT +BUILD_DEFS_EFFECTS+= PKG_JVM PKG_JAVA_HOME MAKEFLAGS+= PKG_JVM=${PKG_JVM:Q} PREPEND_PATH+= ${PKG_JAVA_HOME}/bin |