Replaced all uses of $(DIST)/include with $(PUBLIC) except those looking for NSPR headers.
Removed extra instances of $(DIST)/include or $(PUBLIC) from INCLUDES as it's already there.
Override OS_LIBS when setting host variables for cross-compiling.
JAVAC_CLASSPATH =
$(JAVAC_ZIP)$(PATH_SEPARATOR)$(JAVA_DESTPATH)$(PATH_SEPARATOR)$(JAVA_SOURCEP
ATH)
I changed line 98 to:
JAVAH_FLAGS = -classpath $(JAVAC_ZIP)$(PATH_SEPARATOR)$(JAVA_DESTPATH)