summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjwise <jwise@pkgsrc.org>2002-04-19 17:14:44 +0000
committerjwise <jwise@pkgsrc.org>2002-04-19 17:14:44 +0000
commitf3da648a14207f413a75e3cc202fe48486af775e (patch)
tree881b1ab262217fa203ef45d9e51976ec8058dad0 /mk
parent0c650c171e99a14fb7403e24f5b6898177a96f75 (diff)
downloadpkgsrc-f3da648a14207f413a75e3cc202fe48486af775e.tar.gz
Fix problem where CLASSPATH was not being added to MAKE_ENV, CONFIGURE_ENV,
or SCRIPTS_ENV in non-native jdk case.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 26d60a3cd98..e159eff1399 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.966 2002/04/18 20:54:51 agc Exp $
+# $NetBSD: bsd.pkg.mk,v 1.967 2002/04/19 17:14:44 jwise Exp $
#
# This file is in the public domain.
#
@@ -89,15 +89,15 @@ JAVA_HOME?= ${LOCALBASE}/kaffe
. endif
. if exists(${JAVA_HOME}/lib/classes.zip)
CLASSPATH?= ${JAVA_HOME}/lib/classes.zip:.
-
-MAKE_ENV+= CLASSPATH=${CLASSPATH}
-CONFIGURE_ENV+= CLASSPATH=${CLASSPATH}
-SCRIPTS_ENV+= CLASSPATH=${CLASSPATH}
. endif
PATH:= ${PATH}:${JAVA_HOME}/bin
MAKE_ENV+= JAVA_HOME=${JAVA_HOME}
CONFIGURE_ENV+= JAVA_HOME=${JAVA_HOME}
SCRIPTS_ENV+= JAVA_HOME=${JAVA_HOME}
+
+MAKE_ENV+= CLASSPATH=${CLASSPATH}
+CONFIGURE_ENV+= CLASSPATH=${CLASSPATH}
+SCRIPTS_ENV+= CLASSPATH=${CLASSPATH}
.endif
# Set X11PREFIX to reflect the install directory of X11 packages.