diff --git a/mozilla/directory/Makefile b/mozilla/directory/Makefile
index 1af061e72ff..ca4695e15ab 100644
--- a/mozilla/directory/Makefile
+++ b/mozilla/directory/Makefile
@@ -166,11 +166,14 @@ ifeq ($(HAVE_CCONF), 1)
 #	cd $(CORECONFDIR)/dbm; \
 #	$(MAKE) VERSION=$(DBM_RELEASE_TAG)     $(MFLAGS) $(COMP_PULL_ARG) import
 	cd $(CORECONFDIR)/nspr20; \
-	$(MAKE) VERSION=$(NSPR_RELEASE_TAG)    $(MFLAGS) $(COMP_PULL_ARG) import
+			$(MAKE) RELEASE_TREE=$(NSPR_RELEASE_TREE) \
+			VERSION=$(NSPR_RELEASE_TAG) $(MFLAGS) $(COMP_PULL_ARG) import
 	cd $(CORECONFDIR)/security; \
-	$(MAKE) VERSION=$(NSS_RELEASE_TAG)     $(MFLAGS) $(COMP_PULL_ARG) import
+			$(MAKE) RELEASE_TREE=$(NSS_RELEASE_TREE) \
+			VERSION=$(NSS_RELEASE_TAG) $(MFLAGS) $(COMP_PULL_ARG) import
 	cd $(CORECONFDIR)/svrcore; \
-	$(MAKE) VERSION=$(SVRCORE_RELEASE_TAG) $(MFLAGS) $(COMP_PULL_ARG) import
+			$(MAKE) RELEASE_TREE=$(SVRCORE_RELEASE_TREE) \
+			VERSION=$(SVRCORE_RELEASE_TAG) $(MFLAGS) $(COMP_PULL_ARG) import
 endif
 endif
 
diff --git a/mozilla/directory/c-sdk/build.mk b/mozilla/directory/c-sdk/build.mk
index 28ba0e1bed2..7c175d4cf95 100644
--- a/mozilla/directory/c-sdk/build.mk
+++ b/mozilla/directory/c-sdk/build.mk
@@ -161,14 +161,9 @@ NSCCK_LIBNAME	=libnscck$(NLS_LIBVERSION).$(LIB_SUFFIX)
 NSSB_LIBNAME	=libnssb$(NLS_LIBVERSION).$(LIB_SUFFIX)
 endif
 
-ifdef RELEASE_TREE
-LIBNLS_INCLUDES_LOC = $(RELEASE_TREE)/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME)/include
-LIBNLS_LIB_LOC	    = $(RELEASE_TREE)/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME)/lib
-else
-LIBNLS_INCLUDES_LOC = /share/builds/components/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME)/include
-LIBNLS_LIB_LOC	    = /share/builds/components/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME)/lib
+LIBNLS_INCLUDES_LOC = $(LIBNLS_RELEASE_TREE)/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME)/include
+LIBNLS_LIB_LOC	    = $(LIBNLS_RELEASE_TREE)/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME)/lib
 
-endif
 LIBNLS_DIR	    = ../../../../../dist/libnls$(NLS_LIBVERSION)
 ifeq ($(COMPONENT_PULL_METHOD), FTP)
 LIBNLS_INCLUDES =../../../../../dist/libnls$(NLS_LIBVERSION)/$(OBJDIR_NAME)/include
diff --git a/mozilla/directory/c-sdk/component_versions.mk b/mozilla/directory/c-sdk/component_versions.mk
index 2c53f46a643..976751ecb4a 100644
--- a/mozilla/directory/c-sdk/component_versions.mk
+++ b/mozilla/directory/c-sdk/component_versions.mk
@@ -20,17 +20,22 @@
 # Contributor(s): 
 #
 
+COMPONENTS_DIR		= /share/builds/components
+
 # NSPR - Netscape Portable Runtime
 NSPR_LIBVERSION		= 4
 NSPR_RELEASE_TAG	= v4.1.2
+NSPR_RELEASE_TREE	= $(COMPONENTS_DIR)
 
 # NSS - Network Security Services
 NSSVERS			= 3
 NSS_RELEASE_TAG		= NSS_3_3_2_RTM
 #NSS_DYNAMIC_SOFTOKN	= 1
+NSS_RELEASE_TREE	= $(COMPONENTS_DIR)
 
 # SVRCORE - Client/server utility library
 SVRCORE_RELEASE_TAG	= SVRCORE_3_3_RTM
+SVRCORE_RELEASE_TREE	= $(COMPONENTS_DIR)
 
 # LDAP library
 LDAPVERS		= 50
@@ -64,6 +69,7 @@ SSLDAPVERS_SUFFIX 	= 5.0
 # libNLS - National Language Support.
 NLS_LIBVERSION		= 31
 LIBNLS_RELDATE		= v3.2
+LIBNLS_RELEASE_TREE	= $(COMPONENTS_DIR)
 
 # Some components already had existing Solaris 5.8 symbolic
 # link to a Solaris 5.6 version.  Hence, the new respun components
diff --git a/mozilla/directory/c-sdk/config/config.mk b/mozilla/directory/c-sdk/config/config.mk
index 5373bb4700f..74ce466da8d 100644
--- a/mozilla/directory/c-sdk/config/config.mk
+++ b/mozilla/directory/c-sdk/config/config.mk
@@ -212,14 +212,6 @@ endif
 #
 ####################################################################
 
-MDIST = /share/builds/components
-ifeq ($(OS_ARCH),WINNT)
-MDIST = //helium/dist
-MDIST_DOS = $(subst /,\\,$(MDIST))
-endif
-
-# RELEASE_DIR is ns/dist/<module name>
-
 RELEASE_DIR = $(NSDEPTH)/dist/release/$(MOD_NAME)
 
 RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include
diff --git a/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client b/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client
index 19e84ba6bcc..0fc70954a66 100644
--- a/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client
@@ -314,7 +314,7 @@ ifeq ($(HAVE_LIBNLS), 1)
 # $(NLS_VERSION_FILE)
 	sh ../../build/compver.sh $(LIBNLS_DIR) $(LIBNLS_RELDATE) \
 	$(OBJDIR_NAME) ../../../../dist ldapsdk \
-	/share/builds/components/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME) \
+	$(LIBNLS_RELEASE_TREE)/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME) \
 	libnls$(NLS_LIBVERSION) \
 	"include lib conv$(NLS_LIBVERSION) locale$(NLS_LIBVERSION)" \
 	../../../../../dist/libnls$(NLS_LIBVERSION)/$(OBJDIR_NAME)/locale$(NLS_LIBVERSION)/index.txt
diff --git a/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.in b/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.in
index 4103ba8d57a..7a170969d4b 100644
--- a/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.in
+++ b/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.in
@@ -314,7 +314,7 @@ ifeq ($(HAVE_LIBNLS), 1)
 # $(NLS_VERSION_FILE)
 	sh ../../build/compver.sh $(LIBNLS_DIR) $(LIBNLS_RELDATE) \
 	$(OBJDIR_NAME) ../../../../dist ldapsdk \
-	/share/builds/components/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME) \
+	$(LIBNLS_RELEASE_TREE)/libnls$(NLS_LIBVERSION)/$(LIBNLS_RELDATE)/$(OBJDIR_NAME) \
 	libnls$(NLS_LIBVERSION) \
 	"include lib conv$(NLS_LIBVERSION) locale$(NLS_LIBVERSION)" \
 	../../../../../dist/libnls$(NLS_LIBVERSION)/$(OBJDIR_NAME)/locale$(NLS_LIBVERSION)/index.txt