diff --git a/mozilla/java/dom/Makefile b/mozilla/java/dom/Makefile
index 35ee1d8c516..8b2208f589f 100644
--- a/mozilla/java/dom/Makefile
+++ b/mozilla/java/dom/Makefile
@@ -13,7 +13,7 @@
 # Inc. Portions created by Sun are Copyright (C) 1999 Sun Microsystems,
 # Inc. All Rights Reserved. 
 
-DEPTH		= /opt/mozilla
+DEPTH		= ../..
 topsrcdir	= $(DEPTH)
 srcdir		= .
 VPATH		= .
@@ -30,16 +30,15 @@ CPPSRCS		= \
 
 include $(topsrcdir)/config/config.mk
 
-JAVA_HOME	= /opt/jdk
-INCLUDES	+= -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/solaris
+INCLUDES	+= -I$(JAVAHOME)/include -I$(JAVAHOME)/include/solaris
 DSO_LDOPTS	+= \
-	-L$(JAVA_HOME)/jre/lib/sparc \
-	-L$(JAVA_HOME)/jre/lib/sparc/classic \
-	-L$(JAVA_HOME)/jre/lib/sparc/native_threads \
-	-R$(JAVA_HOME)/jre/lib/sparc \
-	-R$(JAVA_HOME)/jre/lib/sparc/classic \
-	-R$(JAVA_HOME)/jre/lib/sparc/native_threads \
-	-ljvm -lhpi -lsunwjit
+	-L$(JAVAHOME)/jre/lib/sparc \
+	-L$(JAVAHOME)/jre/lib/sparc/classic \
+	-L$(JAVAHOME)/jre/lib/sparc/native_threads \
+	-R$(JAVAHOME)/jre/lib/sparc \
+	-R$(JAVAHOME)/jre/lib/sparc/classic \
+	-R$(JAVAHOME)/jre/lib/sparc/native_threads \
+	-ljvm -lhpi
 
 EXPORTS 	= \
 	nsJavaDOMCID.h \
diff --git a/mozilla/java/dom/Makefile.in b/mozilla/java/dom/Makefile.in
index 4eaad69cc4f..a4ad77b5580 100644
--- a/mozilla/java/dom/Makefile.in
+++ b/mozilla/java/dom/Makefile.in
@@ -30,15 +30,14 @@ CPPSRCS		= \
 
 include $(topsrcdir)/config/config.mk
 
-JAVA_HOME	= /opt/jdk
-INCLUDES	+= -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/solaris
+INCLUDES	+= -I$(JAVAHOME)/include -I$(JAVAHOME)/include/solaris
 DSO_LDOPTS	+= \
-	-L$(JAVA_HOME)/jre/lib/sparc \
-	-L$(JAVA_HOME)/jre/lib/sparc/classic \
-	-L$(JAVA_HOME)/jre/lib/sparc/native_threads \
-	-R$(JAVA_HOME)/jre/lib/sparc \
-	-R$(JAVA_HOME)/jre/lib/sparc/classic \
-	-R$(JAVA_HOME)/jre/lib/sparc/native_threads \
+	-L$(JAVAHOME)/jre/lib/sparc \
+	-L$(JAVAHOME)/jre/lib/sparc/classic \
+	-L$(JAVAHOME)/jre/lib/sparc/native_threads \
+	-R$(JAVAHOME)/jre/lib/sparc \
+	-R$(JAVAHOME)/jre/lib/sparc/classic \
+	-R$(JAVAHOME)/jre/lib/sparc/native_threads \
 	-ljvm -lhpi -lsunwjit
 
 EXPORTS 	= \
diff --git a/mozilla/java/dom/jni/Makefile b/mozilla/java/dom/jni/Makefile
index 01086b063ce..d8b52510572 100644
--- a/mozilla/java/dom/jni/Makefile
+++ b/mozilla/java/dom/jni/Makefile
@@ -14,9 +14,9 @@
 # Inc. All Rights Reserved. 
 
 DEPTH		= ../../..
-topsrcdir	= /opt/mozilla
-srcdir		= /opt/mozilla/java/dom/jni
-VPATH		= /opt/mozilla/java/dom/jni
+topsrcdir	= $(DEPTH)
+srcdir		= .
+VPATH		= .
 
 include $(DEPTH)/config/autoconf.mk