--- a/usr/src/Makefile.env	Tue Aug 09 12:37:14 2011 -0400
+++ b/usr/src/Makefile.env	Thu Aug 11 15:41:42 2011 -0700
@@ -110,14 +110,19 @@
 CTFCONVERT = /opt/onbld/bin/$(ISA)/ctfconvert
 
 # Set here explicitly to avoid compiling with newer class version
-JAVAC = /usr/bin/javac
-JAR = /usr/bin/jar
-JAVADOC = /usr/bin/javadoc
-JAVAH = /usr/bin/javah
+JDK_HOME = /usr
+JAVA_HOME = /usr
+
+JAVAC = $(JDK_HOME)/bin/javac
+JAR = $(JDK_HOME)/bin/jar
+JAVADOC = $(JDK_HOME)/bin/javadoc
+JAVAH = $(JDK_HOME)/bin/javah
+
+JAVA = $(JAVA_HOME)/bin/java
 
 # Consumers must depend on java (or java/adr)
 ADRLOC=$(SRC)/java/adr/adr.jar
-ADRGEN=java -classpath $(ADRLOC) org.opensolaris.os.adr.adrgen.ADRGen
+ADRGEN=$(JAVA) -classpath $(ADRLOC) org.opensolaris.os.adr.adrgen.ADRGen
 
 # Lint
 LINTFLAGS = -s -errtags=yes -errsecurity=core -errwarn=%all