diff --git a/mozilla/directory/Makefile b/mozilla/directory/Makefile
index 736c409668f..e188bc70424 100644
--- a/mozilla/directory/Makefile
+++ b/mozilla/directory/Makefile
@@ -72,13 +72,14 @@ ifneq ($(HAVE_CCONF), 1)
 	else \
 		echo "No NSS $(NSS_VERSION) directory found"; \
 	fi
-endif
+else
 	@if [ -d $(CONFIGDIR)/ ]; then \
 		cd $(CONFIGDIR); \
 		gmake; \
 	else \
 		echo "No NSS $(CONFIGDIR) directory found"; \
 	fi
+endif
 	@if [ -d $(LDAP_DEPTH)/c-sdk/ldap ]; then \
 		cd $(LDAP_DEPTH)/c-sdk/ldap; \
 		$(MAKE) -f Makefile.client $(MFLAGS) export; \
diff --git a/mozilla/directory/c-sdk/build.mk b/mozilla/directory/c-sdk/build.mk
index 574fd6031a1..f4a91988b2a 100644
--- a/mozilla/directory/c-sdk/build.mk
+++ b/mozilla/directory/c-sdk/build.mk
@@ -32,6 +32,8 @@ endif
 LDAPVERS	= 50
 LDAPVERS_SUFFIX = 5.0
 LDAP_LIBNAME	= ldap$(LDAPVERS)
+DIR_VERSION     = $(LDAPVERS_SUFFIX)
+DIRSDK_VERSION  = $(LDAPVERS_SUFFIX)
 
 # PrLdap library
 PRLDAPVERS      = 50
diff --git a/mozilla/directory/c-sdk/config/SunOS5.mk b/mozilla/directory/c-sdk/config/SunOS5.mk
index af7973fdee2..71763d73f95 100644
--- a/mozilla/directory/c-sdk/config/SunOS5.mk
+++ b/mozilla/directory/c-sdk/config/SunOS5.mk
@@ -63,7 +63,11 @@ else
     DEFINES += -D_PR_LOCAL_THREADS_ONLY
   else
     USE_PTHREADS = 1
+ifdef HAVE_CCONF 
+    IMPL_STRATEGY =
+else
     IMPL_STRATEGY = _PTH
+endif
   endif
 endif
 
@@ -104,8 +108,12 @@ endif
 endif
 COMPILER_TAG		= _64
 else
+ifdef HAVE_CCONF
+COMPILER_TAG		=
+else
 COMPILER_TAG		= _32
 endif
+endif
 
 RANLIB			= echo
 
@@ -124,9 +132,18 @@ OPTIMIZER		= -Wa,-s -gstabs
 endif
 endif
 else
+ifdef HAVE_CCONF
+CPU_ARCH		=
+else
 CPU_ARCH		= sparc
 endif
+endif
+
+ifdef HAVE_CCONF
+CPU_ARCH_TAG		=
+else
 CPU_ARCH_TAG		= _$(CPU_ARCH)
+endif
 
 ifeq (5.5,$(findstring 5.5,$(OS_RELEASE)))
 OS_DEFINES		+= -DSOLARIS2_5
diff --git a/mozilla/directory/c-sdk/ldap/build/Makefile.client b/mozilla/directory/c-sdk/ldap/build/Makefile.client
index bb81b5898c7..04e02be3904 100644
--- a/mozilla/directory/c-sdk/ldap/build/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/build/Makefile.client
@@ -23,7 +23,6 @@
 DEPTH		= ../../../..
 MOD_DEPTH	= ../..
 NSPR_TREE	= ../..
-
 CSRCS	= dirver.c
 
 include $(NSPR_TREE)/config/rules.mk
@@ -41,7 +40,7 @@ $(TARGETS): $(OBJS)
 endif
 
 export:: $(TARGETS)
-	$(INSTALL) -m 555 $(TARGETS) $(DIST)/bin
+	$(INSTALL) -m 555 $(TARGETS) ../$(DIST)/bin
 
 install:: export
 
diff --git a/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client b/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client
index 5a7250670ea..f7acee60281 100644
--- a/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.client
@@ -21,21 +21,24 @@
 #
 		    
 NS_DEPTH        = ../../../..
-MOD_DEPTH       = ../../..
-NSPR_TREE       = ../../..
 LDAP_SRC	= ../..
 NSCP_DISTDIR	= ../../../../../dist
+NSPR_TREE = ../../..
+MOD_DEPTH = ../../..
 
-include		$(NSPR_TREE)/config/rules.mk
+include $(NSPR_TREE)/config/rules.mk
 include		../../../build.mk
 
-INSTALLDIR      = $(DEPTH)/dist/$(OBJDIR_NAME)
+INSTALLDIR     = $(NSCP_DISTDIR)/$(OBJDIR_NAME)/bin
+HEADERDIR      = $(DEPTH)/dist/$(OBJDIR_NAME)
 
-INCLUDES	+= -I../../../../..$(INSTALLDIR)/include \
+INCLUDES	+= -I../../../../..$(HEADERDIR)/include \
 		-I../../../../../dist/include/obsolete \
 		-I../../../../../dist/include \
 		-I../../../../../dist/public/security \
-		-I../../../ldap/include
+		-I../../../../../dist/public/nss \
+		-I../../../ldap/include \
+		-I../../../../../dist/public/svrcore
 ifdef HAVE_LIBNLS
 INCLUDES	+= -I$(LIBNLS_INCLUDES)
 endif
@@ -149,6 +152,17 @@ else
 	$(NSINSTALL) $(LIBLOCATION)/lib$(LDAP_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
 	$(NSINSTALL) $(LIBLOCATION)/lib$(PRLDAP_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
 	$(NSINSTALL) $(LIBLOCATION)/lib$(SSLDAP_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
+ifeq ($(HAVE_CCONF), 1)
+	$(NSINSTALL) $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/lib$(PLC_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
+	$(NSINSTALL) $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/lib$(PLDS_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
+	$(NSINSTALL) $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/lib$(NSPR_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
+	$(NSINSTALL) $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/lib$(SSL_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
+	$(NSINSTALL) $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/lib$(NSS_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
+ifeq ($(COPYFREEBL), 1)
+	$(NSINSTALL) $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/lib$(HYBRID_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
+	$(NSINSTALL) $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/lib$(PURE32_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
+endif
+else
 	$(NSINSTALL) $(NSCP_DISTDIR)/lib/lib$(PLC_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
 	$(NSINSTALL) $(NSCP_DISTDIR)/lib/lib$(PLDS_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
 	$(NSINSTALL) $(NSCP_DISTDIR)/lib/lib$(NSPR_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
@@ -159,6 +173,7 @@ ifeq ($(COPYFREEBL), 1)
 	$(NSINSTALL) $(NSCP_DISTDIR)/lib/lib$(PURE32_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
 endif
 endif
+endif
 
 $(LDAPTOOLCOMMON_OBJ):
 
@@ -184,6 +199,11 @@ clean::
 	$(RM) $(BINS)
 
 install:: $(OBJDEST) libdir $(BINS)
+	$(NSINSTALL) $(LDAPDELETE) $(INSTALLDIR)
+	$(NSINSTALL) $(LDAPSEARCH) $(INSTALLDIR)
+	$(NSINSTALL) $(LDAPMODIFY) $(INSTALLDIR)
+	$(NSINSTALL) $(LDAPCMP)	   $(INSTALLDIR)
+
 
 #
 # Simple, local dependencies
diff --git a/mozilla/directory/c-sdk/ldap/include/Makefile.client b/mozilla/directory/c-sdk/ldap/include/Makefile.client
index d02c3724272..83fd193d90f 100644
--- a/mozilla/directory/c-sdk/ldap/include/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/include/Makefile.client
@@ -33,24 +33,24 @@ HEADERS		= \
 		  disptmpl.h \
 		  lber.h \
 		  ldap.h \
+		  ldap_ssl.h \
+		  iutil.h \
 		  srchpref.h \
 		  $(NULL)
 
 include $(NSPR_TREE)/config/rules.mk
+include ../../build.mk
 
 GARBAGE		+= sdkver.h dirver.h
 
 ETCDIR		= $(DIST)/etc
 INCLUDEDIR	= $(XPDIST)/public/ldap
 
-DIR_VERSION	:= 2.0
-DIRSDK_VERSION	:= 1.0
-
 ifeq ($(OS_ARCH), WINNT)
 # Is this correct?
 DIRVER_PATH	= $(DEPTH)/netsite/ldap/build
 else
-DIRVER_PATH	= $(DIST)/bin
+DIRVER_PATH	= ../$(DIST)/bin
 endif
 
 DIRVER_PROG	= $(DIRVER_PATH)/dirver$(BIN_SUFFIX)
@@ -59,7 +59,6 @@ DIRVER_PROG	= $(DIRVER_PATH)/dirver$(BIN_SUFFIX)
 
 all export::	sdkver.h dirver.h FORCE
 	$(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(INCLUDEDIR)
-	$(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(DIST)/include
 
 sdkver.h:	$(DIRVER_PROG)
 	@$< $(DIRSDK_VERSION) UseSystemDate $@
diff --git a/mozilla/directory/c-sdk/ldap/libraries/Makefile.client b/mozilla/directory/c-sdk/ldap/libraries/Makefile.client
index 20d0f28a96b..70222af17d4 100644
--- a/mozilla/directory/c-sdk/ldap/libraries/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/libraries/Makefile.client
@@ -21,11 +21,10 @@
 #
 
 DEPTH	    = ../../../..
-MOD_DEPTH   = ../..
-NSPR_TREE   = ../..
-UNIXDIRLIST = liblber libldif libiutil libldap libprldap libssldap
+NSPR_TREE = ../..
+MOD_DEPTH = ../..
 
-include $(NSPR_TREE)/config/rules.mk
+UNIXDIRLIST = liblber libldif libiutil libldap libprldap libssldap
 
 all export::	FORCE
 	@for i in $(UNIXDIRLIST); do \
diff --git a/mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.client b/mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.client
index 1d68426ed66..fc87bd03b6b 100644
--- a/mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.client
@@ -22,13 +22,13 @@
 
 DEPTH		= ../../../../..
 NS_DEPTH	= ../../../..
-MOD_DEPTH       = ../../..
-NSPR_TREE	= ../../..
 LDAP_SRC	= ../..
 NSCP_DISTDIR	= ../../../../../dist
+NSPR_TREE       = ../../..
+MOD_DEPTH       = ../../..
 
-include		$(NSPR_TREE)/config/rules.mk
-include		../../../build.mk
+include $(NSPR_TREE)/config/rules.mk
+include         ../../../build.mk
 
 SRCS		= iutil-lock.c
 
diff --git a/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.client b/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.client
index be68b72324d..a9a375e4355 100644
--- a/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.client
@@ -22,12 +22,12 @@
 
 DEPTH		= ../../../../..
 NS_DEPTH	= ../../../..
-MOD_DEPTH       = ../../..
-NSPR_TREE	= ../../..
 LDAP_SRC        = ../..
 NSCP_DISTDIR    = ../../../../../dist
+NSPR_TREE	= ../../..
+MOD_DEPTH	= ../../..
 
-include         $(NSPR_TREE)/config/rules.mk
+include $(NSPR_TREE)/config/rules.mk
 include         ../../../build.mk
 
 SRCS		= decode.c \
diff --git a/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client b/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client
index 44ca4ab2c73..ee0120856ae 100644
--- a/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client
@@ -22,12 +22,12 @@
 
 DEPTH		= ../../../../..
 NS_DEPTH	= ../../../..
-MOD_DEPTH       = ../../..
-NSPR_TREE       = ../../..
 LDAP_SRC        = ../..
 NSCP_DISTDIR    = ../../../../../dist
+NSPR_TREE = ../../..
+MOD_DEPTH = ../../..
 
-include         $(NSPR_TREE)/config/rules.mk
+include $(NSPR_TREE)/config/rules.mk
 include         ../../../build.mk
 
 SRCS		= abandon.c \
diff --git a/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.client b/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.client
index b1cf7cc1696..d02dca9f489 100644
--- a/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.client
@@ -22,12 +22,12 @@
 
 DEPTH		= ../../../../..
 NS_DEPTH	= ../../../..
-MOD_DEPTH       = ../../..
-NSPR_TREE	= ../../..
 LDAP_SRC	= ../..
 NSCP_DISTDIR	= ../../../../../dist
+NSPR_TREE = ../../..
+MOD_DEPTH = ../../..
 
-include		$(NSPR_TREE)/config/rules.mk
+include $(NSPR_TREE)/config/rules.mk
 include		../../../build.mk
 
 SRCS		= line64.c
diff --git a/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.client b/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.client
index 07da4ced447..be1b3e5e714 100644
--- a/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.client
@@ -22,12 +22,12 @@
 
 DEPTH		= ../../../../..
 NS_DEPTH	= ../../../..
-MOD_DEPTH       = ../../..
-NSPR_TREE	= ../../..
 LDAP_SRC	= ../..
 NSCP_DISTDIR    = ../../../../../dist
+NSPR_TREE = ../../..
+MOD_DEPTH = ../../..
 
-include		$(NSPR_TREE)/config/rules.mk
+include $(NSPR_TREE)/config/rules.mk
 include		../../../build.mk
 
 SRCS		= ldappr-dns.c \
diff --git a/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.client b/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.client
index 03dad8e0948..dcbe5ab26ed 100644
--- a/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.client
+++ b/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.client
@@ -22,10 +22,10 @@
 
 DEPTH		= ../../../../..
 NS_DEPTH	= ../../../..
-MOD_DEPTH       = ../../..
-NSPR_TREE	= ../../..
 LDAP_SRC	= ../..
 NSCP_DISTDIR	= ../../../../../dist
+NSPR_TREE	= ../../..
+MOD_DEPTH	= ../../..
 
 include		$(NSPR_TREE)/config/rules.mk
 include		../../../build.mk
@@ -48,7 +48,8 @@ INSTALLDIR      = $(DEPTH)/dist/$(OBJDIR_NAME)
 LOCAL_INCLUDES  = -I$(PUBLIC)/nspr
 INCLUDES	+= -I$(HDIR) -I$(INSTALLDIR)/include \
 		   -I../../../../../dist/include \
-		   -I../../../../../dist/public/security
+		   -I../../../../../dist/public/security \
+		   -I../../../../../dist/public/nss
 DEFINES		+= $(DEFS)
 
 PLATFORMCFLAGS	= -DUSE_WAITPID -DNEEDPROTOS