Merge
diff --git a/make/sun/security/mscapi/Makefile b/make/sun/security/mscapi/Makefile
index 188e5d9..3afff4f 100644
--- a/make/sun/security/mscapi/Makefile
+++ b/make/sun/security/mscapi/Makefile
@@ -150,6 +150,7 @@
 # Rules
 #
 CLASSDESTDIR = $(TEMPDIR)/classes
+JAVAHFLAGS += -classpath $(CLASSDESTDIR)
 
 include $(BUILDDIR)/common/Mapfile-vers.gmk
 
diff --git a/make/sun/security/pkcs11/Makefile b/make/sun/security/pkcs11/Makefile
index 0fa4b5b..7915e8c 100644
--- a/make/sun/security/pkcs11/Makefile
+++ b/make/sun/security/pkcs11/Makefile
@@ -148,6 +148,7 @@
 # Rules
 #
 CLASSDESTDIR = $(TEMPDIR)/classes
+JAVAHFLAGS += -classpath $(CLASSDESTDIR)
 
 include $(BUILDDIR)/common/Mapfile-vers.gmk