diff --git a/mozilla/js/src/config.mk b/mozilla/js/src/config.mk index 7befdca027e..d45eb1e6ac4 100644 --- a/mozilla/js/src/config.mk +++ b/mozilla/js/src/config.mk @@ -69,7 +69,7 @@ JAVA_CLASSES = $(patsubst %.java,%.class,$(JAVA_SRCS)) TARGETS += $(addprefix $(CLASSDIR)/$(OBJDIR)/, $(JAVA_CLASSES)) JAVAC = $(JDK)/bin/javac JAVAC_FLAGS = -classpath "$(CLASSPATH)" -d $(CLASSDIR)/$(OBJDIR) -ifeq ($(OS_CONFIG), WINNT) +ifeq ($(OS_ARCH), WINNT) SEP = ; else SEP = : diff --git a/mozilla/js/src/config/WINNT4.0.mk b/mozilla/js/src/config/WINNT4.0.mk index 826a6a20261..1fa2ef929a9 100644 --- a/mozilla/js/src/config/WINNT4.0.mk +++ b/mozilla/js/src/config/WINNT4.0.mk @@ -71,8 +71,8 @@ EXE_LINK_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ /subsystem:console /debug /pdb:none\ /machine:I386 -CAFEDIR = t:/cafe -JCLASSPATH = $(CAFEDIR)/Java/Lib/classes.zip -JAVAC = $(CAFEDIR)/Bin/sj.exe -JAVAH = $(CAFEDIR)/Java/Bin/javah.exe -JCFLAGS = -I$(CAFEDIR)/Java/Include -I$(CAFEDIR)/Java/Include/win32 +# CAFEDIR = t:/cafe +# JCLASSPATH = $(CAFEDIR)/Java/Lib/classes.zip +# JAVAC = $(CAFEDIR)/Bin/sj.exe +# JAVAH = $(CAFEDIR)/Java/Bin/javah.exe +# JCFLAGS = -I$(CAFEDIR)/Java/Include -I$(CAFEDIR)/Java/Include/win32