From 6ac41fa3c12e4465aef2da025847af1a0a0823ac Mon Sep 17 00:00:00 2001
From: jwise <jwise>
Date: Fri, 19 Apr 2002 17:14:44 +0000
Subject: Fix problem where CLASSPATH was not being added to MAKE_ENV,
 CONFIGURE_ENV, or SCRIPTS_ENV in non-native jdk case.

---
 mk/bsd.pkg.mk | 10 +++++-----
 1 file 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.
-- 
cgit v1.2.3