Uncouple the definition of MOZILLA_SECURITY_BUILD from the location of

the "dist" directory used in the NSS build.  MOZILLA_SECURITY_BUILD is
now only useful for iPlanet internal builds, and is not needed by anyone
else.

security/coreconf/location.mk

@@ -41,15 +41,12 @@
 
 BUILD         = $(PLATFORM)
 OBJDIR        = $(PLATFORM)
-ifdef MOZILLA_SECURITY_BUILD
+
 DIST          = $(CORE_DEPTH)/../dist/$(PLATFORM)
-else
 ifdef MOZILLA_CLIENT
 DIST          = $(CORE_DEPTH)/../mozilla/dist/$(PLATFORM)
-else
-DIST          = $(CORE_DEPTH)/dist/$(PLATFORM)
-endif
 endif
+
 VPATH         = $(NSINSTALL_DIR)/$(PLATFORM)
 DEPENDENCIES  = $(PLATFORM)/.md
 

security/coreconf/source.mk

@@ -39,15 +39,10 @@
 # <user_source_tree> master import/export directory prefix
 #
 
-SOURCE_PREFIX = $(CORE_DEPTH)/dist
-ifdef MOZILLA_SECURITY_BUILD
 SOURCE_PREFIX = $(CORE_DEPTH)/../dist
-else
 ifdef MOZILLA_CLIENT
 SOURCE_PREFIX = $(CORE_DEPTH)/../mozilla/dist
 endif
-endif
-
 
 #
 # <user_source_tree> cross-platform (xp) master import/export directory