diff -r 378aa3362868 -r 320a714614e9 jdk/make/java/security/Makefile --- a/jdk/make/java/security/Makefile Tue Mar 06 10:25:45 2012 +0800 +++ b/jdk/make/java/security/Makefile Tue Mar 06 20:34:38 2012 +0000 @@ -45,13 +45,20 @@ ifeq ($(PLATFORM), solaris) PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-solaris -else # PLATFORM +else # NOT_SOLARIS # Register Microsoft CryptoAPI provider only on Windows platform. ifeq ($(PLATFORM), windows) PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows -endif -endif # PLATFORM + +else # NOT_WINDOWS + +ifeq ($(PLATFORM), macosx) + PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-macosx +endif # MACOSX + +endif # NOT_WINDOWS +endif # NOT_SOLARIS PROPS_BUILD = $(LIBDIR)/security/java.security