diff options
| author | jwise <jwise@pkgsrc.org> | 2000-04-24 22:39:11 +0000 |
|---|---|---|
| committer | jwise <jwise@pkgsrc.org> | 2000-04-24 22:39:11 +0000 |
| commit | 60cf0a246aa35277bbd740055b29d3944dd15dc8 (patch) | |
| tree | f1d08a129bc494bf515e26ceb7514a336a45d2b7 /mk | |
| parent | b77f29df694d07c0fedacf78100d8c1bfe5409e4 (diff) | |
| download | pkgsrc-60cf0a246aa35277bbd740055b29d3944dd15dc8.tar.gz | |
Make previous more thorough:
In the USE_JAVA case, make PATH include ${JAVA_HOME}/bin, and set CLASSPATH in
CONFIGURE_ENV and SCRIPTS_ENV as well (no pkgs use this yet, but they could...)
This should make java packages build happily in bulk pkg builds where CLASSPATH
is not set or JAVA_HOME/bin is not in PATH on the system as a whole :-)
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 169fec1fd97..46836fc6a23 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.427 2000/04/24 22:20:02 jwise Exp $ +# $NetBSD: bsd.pkg.mk,v 1.428 2000/04/24 22:39:11 jwise Exp $ # # This file is in the public domain. # @@ -96,9 +96,11 @@ JAVA_HOME?= ${LOCALBASE}/java DEPENDS+= kaffe-[0-9]*:${PKGSRCDIR}/lang/kaffe JAVA_HOME?= ${LOCALBASE}/kaffe .endif -.if !defined(CLASSPATH) -MAKE_ENV+= CLASSPATH=${JAVA_HOME}/lib/classes.zip:. -.endif +CLASSPATH?= ${JAVA_HOME}/lib/classes.zip:. +PATH:= ${PATH}:${JAVA_HOME}/bin +MAKE_ENV+= CLASSPATH=${CLASSPATH} +CONFIGURE_ENV+= CLASSPATH=${CLASSPATH} +SCRIPTS_ENV+= CLASSPATH=${CLASSPATH} .endif .if defined(USE_MOTIF) |