updated rules

modules/Makefile

@@ -36,7 +36,7 @@ DIRS		= \
     progress \
 	$(NULL)
 
-ifdef NO_SECURITY
+ifndef MOZ_SECURITY
 DIRS +=	security
 endif
 

modules/makefile.win

@@ -42,7 +42,7 @@ include <$(DEPTH)/config/liteness.mak>
 #//
 #//------------------------------------------------------------------------
 DIRS=                   \
-!ifdef NO_SECURITY
+!ifndef MOZ_SECURITY
 	security        \
 !endif
 	libreg          \

modules/security/Makefile

@@ -17,15 +17,6 @@
 
 DEPTH		= ../..
 
-ifndef NO_SECURITY
-DIRS		= nav
-
-ifdef MOZ_JAVA
-DIRS		+= java
-endif
-
-else
 DIRS		= freenav
-endif
 
 include $(DEPTH)/config/rules.mk

modules/security/makefile.win

@@ -37,7 +37,7 @@ DEPTH=..\..
 #// DIRS          - There are subdirectories to process
 #//
 #//------------------------------------------------------------------------
-!ifdef NO_SECURITY
+!ifndef MOZ_SECURITY
 DIRS	= freenav
 !endif