[pkgsrc/trunk]: pkgsrc/mk Since PKG_JVM is not user-settable, it must not be ...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8dc6dfc82ed7
branches:  trunk
changeset: 521081:8dc6dfc82ed7
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Nov 04 21:56:49 2006 +0000

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

 mk/java-vm.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r eb3d14b2a710 -r 8dc6dfc82ed7 mk/java-vm.mk
--- a/mk/java-vm.mk     Sat Nov 04 21:54:26 2006 +0000
+++ b/mk/java-vm.mk     Sat Nov 04 21:56:49 2006 +0000
@@ -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 @@
 
 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