diff options
| author | jlam <jlam> | 2002-07-29 22:15:02 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-07-29 22:15:02 +0000 |
| commit | 312f6857af7cc9c2c44c9d19cfd9a26509a9479b (patch) | |
| tree | 21e901fd05d52240daccdcfd2629e7785a8e8c2c /mk | |
| parent | 5c435be84fb2ed7f15c4a410e65ca3b1334a33ac (diff) | |
| download | pkgsrc-312f6857af7cc9c2c44c9d19cfd9a26509a9479b.tar.gz | |
Invert the test for USE_JAVA. It now takes an optional value of "run"
(instead of "build"). The rationale is that USE_JAVA= is "bigger" than
USE_JAVA=run in the sense that the former adds another dependency. For
packages that don't need the extra dependency, we can trim it off by
setting USE_JAVA more thoughtfully.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 0b13b002b82..f65be1f77b9 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1019 2002/07/29 21:45:22 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1020 2002/07/29 22:15:02 jlam Exp $ # # This file is in the public domain. # @@ -79,11 +79,10 @@ PKG_JVM?= sun-jdk PKG_JVM?= kaffe . endif . endif -. if (${USE_JAVA} == "build") -_JDK_DEPMETHOD= BUILD_DEPENDS -. else -USE_JAVA:= run +. if (${USE_JAVA} == "run") _JDK_DEPMETHOD= _UNUSED_DEPENDS +. else +_JDK_DEPMETHOD= BUILD_DEPENDS . endif . if ${PKG_JVM} == "jdk" _JAVA_PKGNAME= jdk |