remove references to ldapserver from makefiles; use BUILD_ROOT instead of MCOM_ROOT and NSROOT; BUILD_ROOT is now the ldapserver directory rather than its parent

71 files changed, 317 insertions, 316 deletions

diff --git a/ldap/Makefile b/ldap/Makefile
index 61c3f57b..40f8c134 100644
--- a/ldap/Makefile
+++ b/ldap/Makefile
@@ -9,15 +9,15 @@
 # GNU Makefile for Directory Server and Ldap SDK
 #
 
-MCOM_ROOT = ../..
-LDAP_SRC = $(MCOM_ROOT)/ldapserver/ldap
+BUILD_ROOT = ..
+LDAP_SRC = $(BUILD_ROOT)/ldap
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
 NSPR20=true	# probably should be defined somewhere else (not sure where)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 all: $(LDAP_LIBDIR) $(LDAP_BINDIR) $(LDAP_OBJDIR) ldapprogs ldapdocs
diff --git a/ldap/admin/Makefile b/ldap/admin/Makefile
index 99b1653b..3f8ba6e0 100644
--- a/ldap/admin/Makefile
+++ b/ldap/admin/Makefile
@@ -9,15 +9,15 @@
 # GNU Makefile for Directory Server Admin components
 #
 
-MCOM_ROOT = ../../..
+BUILD_ROOT = ../..
 LDAP_SRC = ../
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
 NSPR20=true	# probably should be defined somewhere else (not sure where)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 all:
diff --git a/ldap/admin/include/Makefile b/ldap/admin/include/Makefile
index 0b45ede0..77cfa706 100644
--- a/ldap/admin/include/Makefile
+++ b/ldap/admin/include/Makefile
@@ -9,13 +9,13 @@
 # GNU Makefile for Directory Server Admin include directory.
 #
 
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 LDAP_SRC = ../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 HDRDEST=$(LDAP_ADMROOT)/include
diff --git a/ldap/admin/lib/Makefile b/ldap/admin/lib/Makefile
index 8aa9a705..b5b6b0f8 100644
--- a/ldap/admin/lib/Makefile
+++ b/ldap/admin/lib/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../..
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -21,8 +21,8 @@ LIBDIR = $(LDAP_LIBDIR)
 ALIBDIR = $(LDAP_ADMLIBDIR)
 BINDIR=$(LDAP_ADMIN_BIN_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 SRCS	= dsalib_location.c dsalib_debug.c dsalib_updown.c dsalib_tailf.c \
@@ -36,7 +36,7 @@ OBJS = $(OBJS1)  $(PWDOBJ)
 
 INCLUDES += -I$(LDAP_SRC)/admin/include
 ifdef FORTEZZA
-INCLUDES += -I$(MCOM_ROOT)/lib
+INCLUDES += -I$(BUILD_ROOT)/lib
 endif
 
 EXTRA_LIBS += $(LDAP_COMMON_LIBS) $(SECURITYLINK) $(NSPRLINK)
diff --git a/ldap/admin/src/DSAdmin.mk b/ldap/admin/src/DSAdmin.mk
index f81ca8a2..a48ca84e 100644
--- a/ldap/admin/src/DSAdmin.mk
+++ b/ldap/admin/src/DSAdmin.mk
@@ -8,16 +8,16 @@
 # Makefile for the DSAdmin dynamic loaded perl module
 
 LDAP_SRC = ../..
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
 NSPR20=true	# probably should be defined somewhere else (not sure where)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 ifndef LDAP_USE_OLD_DB
-include $(MCOM_ROOT)/ldapserver/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usedb.mk
 endif
 
 BINDIR=$(LDAP_ADMIN_BIN_RELDIR)
@@ -48,7 +48,7 @@ else
 endif
 
 ifeq ($(ARCH), WINNT)
-PLATFORM_INCLUDE = -I$(MCOM_ROOT)/ldapserver/include/nt
+PLATFORM_INCLUDE = -I$(BUILD_ROOT)/include/nt
 SUBSYSTEM=console
 EXTRA_LIBS+=comctl32.lib $(LDAP_SDK_LIBLDAP_DLL) $(LDAP_LIBUTIL) 
 EXTRA_LIBS_DEP+=$(LDAP_LIBUTIL_DEP)
diff --git a/ldap/admin/src/Makefile b/ldap/admin/src/Makefile
index e3343791..93bf167a 100644
--- a/ldap/admin/src/Makefile
+++ b/ldap/admin/src/Makefile
@@ -8,7 +8,7 @@
 # Source for the admin forms and CGI programs
 
 LDAP_SRC = ../..
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -19,10 +19,10 @@ OBJDEST=$(LDAP_ADMOBJDIR)
 
 SCRIPTSDIR=$(LDAP_BASE_RELDIR)/admin/scripts
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 ifndef LDAP_USE_OLD_DB
-include $(MCOM_ROOT)/ldapserver/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usedb.mk
 endif
 
 MCC_INCLUDE += $(ADMINUTIL_INCLUDE)
@@ -57,7 +57,7 @@ EXTRA_LIBS = $(DYNAMIC_DEPLINK) $(ADMINUTIL_LINK) $(LDAP_NOSSL_LINK) \
 	$(SECURITYLINK) $(NSPRLINK) $(SETUPSDK_S_LINK) $(ICULINK) $(OLD_EXTRA_LIBS)
 
 ifeq ($(ARCH), WINNT)
-PLATFORM_INCLUDE = -I$(MCOM_ROOT)/ldapserver/include/nt
+PLATFORM_INCLUDE = -I$(BUILD_ROOT)/include/nt
 SUBSYSTEM=console
 EXTRA_LIBS+=comctl32.lib $(LDAP_LIBUTIL)
 EXTRA_LIBS_DEP+=$(LDAP_LIBUTIL_DEP)
@@ -109,7 +109,7 @@ ifeq ($(ARCH), Linux)
 EXTRA_LIBS += -lcrypt
 else
 #this will help with porting other platforms
-EXTRA_LIBS+="you need to define EXTRA_LIBS for $(ARCH) in ldapserver/ldap/admin/src/Makefile"
+EXTRA_LIBS+="you need to define EXTRA_LIBS for $(ARCH) in ldap/admin/src/Makefile"
 endif # Linux
 endif # UnixWare
 endif # AIX
@@ -138,7 +138,7 @@ SECURE_BINS=
 SECLIB=$(LIBSECURITY)
 endif
 
-ADMIN_DLLGLUEOBJ=$(MCOM_ROOT)/ldapserver/built/$(ARCH)-$(SECURITY)-$(DEBUG)-admin/admin-lib/dllglue.o
+ADMIN_DLLGLUEOBJ=$(BUILD_ROOT)/built/$(ARCH)-$(SECURITY)-$(DEBUG)-admin/admin-lib/dllglue.o
 
 ifeq ($(ARCH),AIX)
 DLLGLUEOBJ=
diff --git a/ldap/admin/src/java/com/netscape/xmltools/Makefile b/ldap/admin/src/java/com/netscape/xmltools/Makefile
index 61b4b535..22083770 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/Makefile
+++ b/ldap/admin/src/java/com/netscape/xmltools/Makefile
@@ -14,13 +14,13 @@ NOSTDCLEAN=true
 NO_BUILD_NUM=true
 COMPONENT_DEPS=true
 
-MCOM_ROOT=../../../../../../../..
+BUILD_ROOT=../../../../../../..
 
-include ../../../../../../../nsconfig.mk
-include ../../../../../../../ldap/javarules.mk
+include $(BUILD_ROOT)/nsconfig.mk
+include $(BUILD_ROOT)/ldap/javarules.mk
 CLASS_DIR=$(JAVA_DEST_DIR)/xmltools
-PACKAGE_DIR=$(ABS_ROOT)/dist/$(BUILD_DEBUG)
-_PACKAGE_DIR=$(MCOM_ROOT)/dist/$(BUILD_DEBUG)
+PACKAGE_DIR=$(ABS_ROOT_PARENT)/dist/$(BUILD_DEBUG)
+_PACKAGE_DIR=$(NSCP_DIST)/$(BUILD_DEBUG)
 DEST_DIR=$(CLASS_DIR)/com/netscape/xmltools
 JARS_DIR=lib
 TOOLS_JARS=$(JARS_DIR)/crimson.jar$(PATH_SEP)$(JARS_DIR)/ldapjdk.jar
diff --git a/ldap/clients/Makefile b/ldap/clients/Makefile
index 7447aaf5..089ce483 100644
--- a/ldap/clients/Makefile
+++ b/ldap/clients/Makefile
@@ -14,10 +14,10 @@ override BUILD_MODULE=HTTP_ADMIN
 NOSTDCLEAN=true
 NO_BUILD_NUM=true
 
-MCOM_ROOT=../../..
+BUILD_ROOT=../..
 
-include ../../nsconfig.mk
-include ../../ldap/javarules.mk
+include $(BUILD_ROOT)/nsconfig.mk
+include $(BUILD_ROOT)/ldap/javarules.mk
 
 all: _ldaptags _online _dsgw _dsmlgw
 
diff --git a/ldap/clients/dsgw/Makefile b/ldap/clients/dsgw/Makefile
index 342b87de..b7c06719 100644
--- a/ldap/clients/dsgw/Makefile
+++ b/ldap/clients/dsgw/Makefile
@@ -8,13 +8,13 @@
 # Gmakefile for Directory Server Gateway
 #
 LDAP_SRC = ../..
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
+include $(BUILD_ROOT)/nsdefs.mk
 
 ifneq ($(ARCH), WINNT)
-#OLD_MCOM_ROOT := $(MCOM_ROOT)
-#MCOM_ROOT = $(shell cd $(OLD_MCOM_ROOT); pwd)
+#OLD_BUILD_ROOT := $(BUILD_ROOT)
+#BUILD_ROOT = $(shell cd $(OLD_BUILD_ROOT); pwd)
 #OLD_LDAP_SRC := $(LDAP_SRC)
 #LDAP_SRC = $(shell cd $(OLD_LDAP_SRC); pwd)
 endif
@@ -22,10 +22,10 @@ endif
 NOSTDCLEAN=true # don't let nsconfig.mak define target clean
 NOSTDSTRIP=true # don't let nsconfig.mak define target strip
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 ifndef LDAP_USE_OLD_DB
-include $(MCOM_ROOT)/ldapserver/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usedb.mk
 endif
 
 include dsgw_include.mk
@@ -92,7 +92,7 @@ endif
 BINDIR=$(DSGW_BIN_RELDIR)
 OBJDEST=$(OBJDIR)/clients/dsgw/obj
 
-SRCDIR=$(MCOM_ROOT)/ldapserver/ldap/clients/dsgw
+SRCDIR=$(BUILD_ROOT)/ldap/clients/dsgw
 
 ifeq ($(ARCH), WINNT)
 ALDFLAGS+=-force:multiple
diff --git a/ldap/clients/dsgw/admhtml/Makefile b/ldap/clients/dsgw/admhtml/Makefile
index a8cfafee..e82a8c25 100644
--- a/ldap/clients/dsgw/admhtml/Makefile
+++ b/ldap/clients/dsgw/admhtml/Makefile
@@ -9,13 +9,13 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDSTRIP=true # don't let nsconfig.mak define target strip
 NOSTDCLEAN=true # don't let nsconfig.mak define target clean
 NOSTDDEPEND=true # don't let nsconfig.mak define target depend
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
+include $(BUILD_ROOT)/nsdefs.mk
 
 include ../dsgw_include.mk
 
@@ -48,5 +48,5 @@ $(HTMLDEST)/%.gif: %.gif
 strip:
 depend:
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
diff --git a/ldap/clients/dsgw/config/Makefile b/ldap/clients/dsgw/config/Makefile
index 1ff82d94..930010d1 100644
--- a/ldap/clients/dsgw/config/Makefile
+++ b/ldap/clients/dsgw/config/Makefile
@@ -9,13 +9,13 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDSTRIP=true # don't let nsconfig.mak define target strip
 NOSTDCLEAN=true # don't let nsconfig.mak define target clean
 NOSTDDEPEND=true # don't let nsconfig.mak define target depend
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 include ../dsgw_include.mk
diff --git a/ldap/clients/dsgw/html/Makefile b/ldap/clients/dsgw/html/Makefile
index 8ce1b477..5b5b9d03 100644
--- a/ldap/clients/dsgw/html/Makefile
+++ b/ldap/clients/dsgw/html/Makefile
@@ -9,13 +9,13 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDSTRIP=true # don't let nsconfig.mak define target strip
 NOSTDCLEAN=true # don't let nsconfig.mak define target clean
 NOSTDDEPEND=true # don't let nsconfig.mak define target depend
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 include ../dsgw_include.mk
@@ -40,7 +40,7 @@ else
 CP2=sh ../../../cm/nbsp2utf8.sh $< >
 endif
 
-include $(MCOM_ROOT)/ldapserver/config/webint.mk
+include $(BUILD_ROOT)/config/webint.mk
 
 all: $(HTMLDEST) $(BINS) all-manual all-info
 
diff --git a/ldap/clients/dsgw/html/info/Makefile b/ldap/clients/dsgw/html/info/Makefile
index 34f3f92a..1f791c2a 100644
--- a/ldap/clients/dsgw/html/info/Makefile
+++ b/ldap/clients/dsgw/html/info/Makefile
@@ -9,13 +9,13 @@
 #
 
 LDAP_SRC = ../../../..
-MCOM_ROOT = ../../../../../..
+BUILD_ROOT = ../../../../..
 
 NOSTDSTRIP=true # don't let nsconfig.mak define target strip
 NOSTDCLEAN=true # don't let nsconfig.mak define target clean
 NOSTDDEPEND=true # don't let nsconfig.mak define target depend
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 include ../../dsgw_include.mk
diff --git a/ldap/clients/dsgw/html/manual/Makefile b/ldap/clients/dsgw/html/manual/Makefile
index c8fb1a05..accb957a 100644
--- a/ldap/clients/dsgw/html/manual/Makefile
+++ b/ldap/clients/dsgw/html/manual/Makefile
@@ -9,13 +9,13 @@
 #
 
 LDAP_SRC = ../../../..
-MCOM_ROOT = ../../../../../..
+BUILD_ROOT = ../../../../..
 
 NOSTDSTRIP=true # don't let nsconfig.mak define target strip
 NOSTDCLEAN=true # don't let nsconfig.mak define target clean
 NOSTDDEPEND=true # don't let nsconfig.mak define target depend
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 include ../../dsgw_include.mk
diff --git a/ldap/clients/dsgw/pbconfig/Makefile b/ldap/clients/dsgw/pbconfig/Makefile
index f81f381d..4fad2a25 100644
--- a/ldap/clients/dsgw/pbconfig/Makefile
+++ b/ldap/clients/dsgw/pbconfig/Makefile
@@ -9,13 +9,13 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDSTRIP=true # don't let nsconfig.mak define target strip
 NOSTDCLEAN=true # don't let nsconfig.mak define target clean
 NOSTDDEPEND=true # don't let nsconfig.mak define target depend
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 include ../dsgw_include.mk
diff --git a/ldap/clients/dsgw/pbhtml/Makefile b/ldap/clients/dsgw/pbhtml/Makefile
index 4bc8b354..5e59271a 100644
--- a/ldap/clients/dsgw/pbhtml/Makefile
+++ b/ldap/clients/dsgw/pbhtml/Makefile
@@ -10,13 +10,13 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDSTRIP=true # don't let nsconfig.mak define target strip
 NOSTDCLEAN=true # don't let nsconfig.mak define target clean
 NOSTDDEPEND=true # don't let nsconfig.mak define target depend
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 include ../dsgw_include.mk
@@ -36,7 +36,7 @@ HTML=   emptyFrame.html index.html 16-conference.gif \
 
 BINS=$(addprefix $(HTMLDEST)/,$(HTML))
 
-include $(MCOM_ROOT)/ldapserver/config/webint.mk
+include $(BUILD_ROOT)/config/webint.mk
 
 all: $(HTMLDEST) $(BINS)
 
diff --git a/ldap/clients/dsgw/userhtml/Makefile b/ldap/clients/dsgw/userhtml/Makefile
index 6cc32c6f..4a19446a 100644
--- a/ldap/clients/dsgw/userhtml/Makefile
+++ b/ldap/clients/dsgw/userhtml/Makefile
@@ -9,13 +9,13 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDSTRIP=true # don't let nsconfig.mak define target strip
 NOSTDCLEAN=true # don't let nsconfig.mak define target clean
 NOSTDDEPEND=true # don't let nsconfig.mak define target depend
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 include ../dsgw_include.mk
diff --git a/ldap/clients/dsmlgw/Makefile b/ldap/clients/dsmlgw/Makefile
index 4c2198ea..bca513bf 100644
--- a/ldap/clients/dsmlgw/Makefile
+++ b/ldap/clients/dsmlgw/Makefile
@@ -3,10 +3,10 @@ NO_BUILD_NUM=true
 COMPONENT_DEPS=true
 
 
-MCOM_ROOT=../../../..
+BUILD_ROOT=../../..
 
-include ../../../nsconfig.mk
-include ../../../ldap/javarules.mk
+include $(BUILD_ROOT)/nsconfig.mk
+include $(BUILD_ROOT)/ldap/javarules.mk
 
 all: $(ANT_DEP) $(LDAPJDK_DEP)
 	$(ANT) 
diff --git a/ldap/clients/dsmlgw/build.xml b/ldap/clients/dsmlgw/build.xml
index b94d2ae7..054e10f7 100644
--- a/ldap/clients/dsmlgw/build.xml
+++ b/ldap/clients/dsmlgw/build.xml
@@ -7,8 +7,8 @@
 <project name="dsmlgw" default="dist" basedir=".">
 
 <!-- ******************** Adjustable Properties *********************** -->
-<property name="mcom.root"       value="../../../.."/>
-<property name="globaldist.dir"  value="${mcom.root}/dist/classes"/>
+<property name="mcom.root"       value="../../.."/>
+<property name="globaldist.dir"  value="${mcom.root}/../dist/classes"/>
 <property name="app.name"        value="dsmlgw"/>
 <property name="taglib.name"     value="dsmlgw"/>
 
@@ -31,8 +31,8 @@
 <pathelement location="${xmlParserAPIs.jar}"/>
 </path>
 
-<property name="build.dir"      value="${mcom.root}/ldapserver/built/dsmlgw"/>
-<property name="dist.dir"       value="${mcom.root}/dist/dsmlgw"/>
+<property name="build.dir"      value="${mcom.root}/built/dsmlgw"/>
+<property name="dist.dir"       value="${mcom.root}/../dist/dsmlgw"/>
 
 
 
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index fca029c0..878f7825 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -18,17 +18,17 @@ default help :
 	@echo ""
 
 
-MCOM_ROOT=../../..
-TREE_ROOT=$(MCOM_ROOT)
+BUILD_ROOT=../..
+TREE_ROOT=$(BUILD_ROOT)
 
 # make sure we pull the admin server component here
 ADMSERV_DEPS = 1
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
-include $(MCOM_ROOT)/ldapserver/ldap/nsldap.mk
-include $(MCOM_ROOT)/ldapserver/ldap/javarules.mk
-include $(MCOM_ROOT)/ldapserver/ns_usedb.mk
-include $(MCOM_ROOT)/ldapserver/ns_usesh.mk
+include $(BUILD_ROOT)/nsconfig.mk
+include $(BUILD_ROOT)/ldap/nsldap.mk
+include $(BUILD_ROOT)/ldap/javarules.mk
+include $(BUILD_ROOT)/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usesh.mk
 
 NSDISTMODE = copy
 
@@ -56,12 +56,12 @@ TMP_CM_PWD := $(shell pwd)
 LDAP_CM_ABS_PATH := $(TMP_CM_PWD:/tmp_mnt/%=/%) # AIX prefixes /tmp_mnt to path.
 
 ifneq ($(ARCH), WINNT)
-RELTOOLS=$(MCOM_ROOT)/reltools/ftpname_new.pl
+RELTOOLS=$(RELTOOLSPATH)/ftpname_new.pl
 SUF=-suf .tar
 SUFEXE=-suf .tar.gz
 BACKGROUND=&
 else
-RELTOOLSDIR=$(shell pwd)/../../../reltools
+RELTOOLSDIR=$(RELTOOLSPATH)
 NT_RELTOOLS=$(RELTOOLSDIR)
 RELTOOLS=perl $(RELTOOLSDIR)/ftpname.pl
 SUF=-suf .zip
@@ -173,23 +173,23 @@ ADMIN_SERVER_TARGZ=admserv.tar.gz
 ADMIN_IMPORTS_TARGZ=$(ADMIN_SERVER_TARGZ)
 
 # Release directory for ldapsdk
-RELSDK = $(MCOM_DRIVE)$(RELTOP)/ldapsdk/$(OBJDIR_BASE)
-RELJDK = $(MCOM_DRIVE)$(RELTOP)/ldapjdk
+RELSDK = $(BUILD_DRIVE)$(RELTOP)/ldapsdk/$(OBJDIR_BASE)
+RELJDK = $(BUILD_DRIVE)$(RELTOP)/ldapjdk
 
 # these are files we need to put in the command line/console only package
 #LDAPSDK_IMPORTS=ldapsearch ldapdelete ldapmodify
 
 # perl script to add the slapd information to the base installer
 # setup information file
-FIX_SETUP_INF = $(MCOM_ROOT)/ldapserver/ldap/cm/fixSetupInf.pl
-FIX_BASE_INF = $(MCOM_ROOT)/ldapserver/ldap/cm/fixBaseInf.pl
+FIX_SETUP_INF = $(BUILD_ROOT)/ldap/cm/fixSetupInf.pl
+FIX_BASE_INF = $(BUILD_ROOT)/ldap/cm/fixBaseInf.pl
 
 ifndef INSTDIR
 ifeq ($(ARCH), WINNT)
-INSTDIR = $(TREE_ROOT)/$(MMDD)
+INSTDIR = $(TREE_ROOT)/../$(MMDD)
 else
-INSTDIR = $(MCOM_DRIVE)$(MCOM_ROOT)/$(MMDD)
-ABS_INSTDIR = $(ABS_ROOT)/$(MMDD)
+INSTDIR = $(BUILD_DRIVE)$(BUILD_ROOT)/../$(MMDD)
+ABS_INSTDIR = $(ABS_ROOT_PARENT)/$(MMDD)
 endif
 endif
 # This is the directory where we put what we're making: the files which go on the CD.
@@ -197,9 +197,9 @@ INST_TARGET=$(INSTDIR)/$(NS_BUILD_FLAVOR)
 INST_TARGET_RESKIT=$(INSTDIR)/$(NS_BUILD_FLAVOR)/reskit
 INST_TARGET_INTL=./$(PRODUCT_MARKET)dir
 
-LDAPDIR = $(MCOM_ROOT)/ldapserver/ldap
+LDAPDIR = $(BUILD_ROOT)/ldap
 
-NSDIST = $(MCOM_ROOT)/dist
+NSDIST = $(BUILD_ROOT)/../dist
 
 DS_JAR_SRC_PATH = $(NSDIST)/$(BUILD_DEBUG)
 DS_JAR_DEST_PATH = java/jars
@@ -285,8 +285,8 @@ endif
 	$(CP) -R $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis/*  $(RELDIR)/clients/dsmlgw/
 
 	$(INSTALL) -m 644 $(NSDIST)/dsmlgw/dsmlgw.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/dsmlgw/misc/server-config.wsdd $(RELDIR)/clients/dsmlgw/WEB-INF
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(RELDIR)/clients/dsmlgw/
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/server-config.wsdd $(RELDIR)/clients/dsmlgw/WEB-INF
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(RELDIR)/clients/dsmlgw/
 
 
 # now time to move the necessary jars in place
@@ -308,39 +308,39 @@ endif
 	fi ; \
 	done
 
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/ldif/*.ldif $(RELDIR)/bin/slapd/install/ldif
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/dsml/*.dsml $(RELDIR)/bin/slapd/install/dsml
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/ldif/*.ldif $(RELDIR)/bin/slapd/install/ldif
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/dsml/*.dsml $(RELDIR)/bin/slapd/install/dsml
 # Package online and ldaptags only if they exist: they are only built on 
 # Solaris and NT but packaged on all platforms
-	if [ -d $(MCOM_DRIVE)$(MCOM_ROOT)/dist/online ] ; then \
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/dist/online/*.war $(RELDIR)/clients/slapd ; \
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/online/doc/*.html $(RELDIR)/clients/slapd ; \
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/online/ldif/*.ldif $(RELDIR)/clients/slapd ; \
+	if [ -d $(BUILD_DRIVE)$(BUILD_ROOT)/../dist/online ] ; then \
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/../dist/online/*.war $(RELDIR)/clients/slapd ; \
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/online/doc/*.html $(RELDIR)/clients/slapd ; \
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/online/ldif/*.ldif $(RELDIR)/clients/slapd ; \
 	fi
-#	if [ -d $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/ldaptags ] ; then \
-#	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/ldaptags/doc/*.html $(RELDIR)/clients/slapd ; \
+#	if [ -d $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/ldaptags ] ; then \
+#	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/ldaptags/doc/*.html $(RELDIR)/clients/slapd ; \
 #	fi
 
 ### Package up the orgchart ###
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/orgchart/*.gif $(RELDIR)/clients/orgchart/html
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/orgchart/*.html $(RELDIR)/clients/orgchart/html
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/orgchart/*.css $(RELDIR)/clients/orgchart/html
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/orgchart/*.tmpl $(RELDIR)/clients/orgchart
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.gif $(RELDIR)/clients/orgchart/html
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.html $(RELDIR)/clients/orgchart/html
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.css $(RELDIR)/clients/orgchart/html
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.tmpl $(RELDIR)/clients/orgchart
 
 ifeq ($(ARCH), WINNT)
-	$(INSTALL) -m 755 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/orgchart/*.bat $(RELDIR)/clients/orgchart/bin
-	$(INSTALL) -m 755 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/orgchart/*.pl $(RELDIR)/clients/orgchart/bin
+	$(INSTALL) -m 755 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.bat $(RELDIR)/clients/orgchart/bin
+	$(INSTALL) -m 755 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.pl $(RELDIR)/clients/orgchart/bin
 else
 	$(MKDIR) $(RELDIR)/clients/orgchart/bin
-	$(CP) $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/orgchart/org.pl $(RELDIR)/clients/orgchart/bin/org
-	$(CP) $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/clients/orgchart/myorg.pl $(RELDIR)/clients/orgchart/bin/myorg
+	$(CP) $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/org.pl $(RELDIR)/clients/orgchart/bin/org
+	$(CP) $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/myorg.pl $(RELDIR)/clients/orgchart/bin/myorg
 	chmod 755 $(RELDIR)/clients/orgchart/bin/org
 	chmod 755 $(RELDIR)/clients/orgchart/bin/myorg
 endif
 ### end orgchart package ###
 
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/schema/*.ldif $(RELDIR)/bin/slapd/install/schema
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/schema/slapd-collations.conf $(RELDIR)/bin/slapd/install/config
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/schema/*.ldif $(RELDIR)/bin/slapd/install/schema
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/schema/slapd-collations.conf $(RELDIR)/bin/slapd/install/config
 
 # libdb for windows special and smartheap
 ifeq ($(ARCH), WINNT)
@@ -368,30 +368,30 @@ endif
 endif
 
 # the plugin API
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/slapd/slapi-plugin.h $(RELDIR)/plugins/slapd/slapi/include
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/slapi-plugin.h $(RELDIR)/plugins/slapd/slapi/include
 	$(INSTALL) -m 644 $(NSPR_BUILD_DIR)/include/*.h $(RELDIR)/plugins/slapd/slapi/include
 	$(INSTALL) -m 644 $(NSPR_BUILD_DIR)/include/obsolete/*.h $(RELDIR)/plugins/slapd/slapi/include/obsolete
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/slapd/slapi-plugin-compat4.h $(RELDIR)/plugins/slapd/slapi/include
-#	if [ -f $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/docs/plugin/README ] ; \
-#	then $(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/docs/plugin/README $(RELDIR)/plugins/slapd ; \
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/slapi-plugin-compat4.h $(RELDIR)/plugins/slapd/slapi/include
+#	if [ -f $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/docs/plugin/README ] ; \
+#	then $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/docs/plugin/README $(RELDIR)/plugins/slapd ; \
 #	fi
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/slapd/test-plugins/*.c $(RELDIR)/plugins/slapd/slapi/examples
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/slapd/test-plugins/*.h $(RELDIR)/plugins/slapd/slapi/examples
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/*.c $(RELDIR)/plugins/slapd/slapi/examples
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/*.h $(RELDIR)/plugins/slapd/slapi/examples
 	$(INSTALL) -m 644 $(DB_INCLUDE)/db.h $(RELDIR)/plugins/slapd/slapi/examples
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/slapd/test-plugins/README $(RELDIR)/plugins/slapd/slapi/examples
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/slapd/test-plugins/clients/*.* $(RELDIR)/plugins/slapd/slapi/examples/clients
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/slapd/test-plugins/clients/README $(RELDIR)/plugins/slapd/slapi/examples/clients
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/plugins/distrib/*.c $(RELDIR)/plugins/slapd/slapi/examples/distrib
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/plugins/distrib/README $(RELDIR)/plugins/slapd/slapi/examples/distrib
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/slapd/test-plugins/Makefile.$(MAKEARCH) $(RELDIR)/plugins/slapd/slapi/examples
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/README $(RELDIR)/plugins/slapd/slapi/examples
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/clients/*.* $(RELDIR)/plugins/slapd/slapi/examples/clients
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/clients/README $(RELDIR)/plugins/slapd/slapi/examples/clients
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/plugins/distrib/*.c $(RELDIR)/plugins/slapd/slapi/examples/distrib
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/plugins/distrib/README $(RELDIR)/plugins/slapd/slapi/examples/distrib
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/Makefile.$(MAKEARCH) $(RELDIR)/plugins/slapd/slapi/examples
 	$(MV) $(RELDIR)/plugins/slapd/slapi/examples/Makefile.$(MAKEARCH) $(RELDIR)/plugins/slapd/slapi/examples/Makefile
-	$(CP) $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/plugins/distrib/Makefile.$(MAKEARCH) $(RELDIR)/plugins/slapd/slapi/examples/distrib/Makefile
+	$(CP) $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/plugins/distrib/Makefile.$(MAKEARCH) $(RELDIR)/plugins/slapd/slapi/examples/distrib/Makefile
 ifeq ($(ARCH), WINNT)
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/slapd/test-plugins/testplugin.mak $(RELDIR)/plugins/slapd/slapi/examples
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/slapd/test-plugins/testplugin.def $(RELDIR)/plugins/slapd/slapi/examples
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/slapd/test-plugins/testplugin.dsp $(RELDIR)/plugins/slapd/slapi/examples
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/plugins/distrib/distrib.dsp $(RELDIR)/plugins/slapd/slapi/examples/distrib
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/plugins/distrib/libdistrib.def $(RELDIR)/plugins/slapd/slapi/examples/distrib
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/testplugin.mak $(RELDIR)/plugins/slapd/slapi/examples
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/testplugin.def $(RELDIR)/plugins/slapd/slapi/examples
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/test-plugins/testplugin.dsp $(RELDIR)/plugins/slapd/slapi/examples
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/plugins/distrib/distrib.dsp $(RELDIR)/plugins/slapd/slapi/examples/distrib
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/plugins/distrib/libdistrib.def $(RELDIR)/plugins/slapd/slapi/examples/distrib
 endif
 ifeq ($(ARCH), WINNT)
 	$(INSTALL) -m 755 $(LIBSLAPD) $(RELDIR)/plugins/slapd/slapi/lib
@@ -417,7 +417,7 @@ endif
 
 # Images for IM Presence plugin
 ifdef BUILD_PRESENCE
-	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/plugins/presence/images/*.gif $(RELDIR)/bin/slapd/install/presence
+	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/plugins/presence/images/*.gif $(RELDIR)/bin/slapd/install/presence
 endif
 
 # docs
@@ -557,7 +557,7 @@ $(INSTDIR)/$(NS_BUILD_FLAVOR)/nsperl/$(NSPERL_ZIP_FILE):
 # one more hack to nsperl - we must remove LDIF.pm because it
 # conflicts with the one in perldap - bug 600138
 # SITEHACK is defined in nsperl.mk
-	$(ZIP) -d $(dir $@)/$(NSPERL_ZIP_FILE) lib/nsPerl5.6.1/$(SITEHACK)/Mozilla/LDAP/LDIF.pm
+#	$(ZIP) -d $(dir $@)/$(NSPERL_ZIP_FILE) lib/nsPerl5.6.1/$(SITEHACK)/Mozilla/LDAP/LDIF.pm
 
 $(INSTDIR)/$(NS_BUILD_FLAVOR)/slapd:
 	$(MKDIR) -p $@
@@ -669,8 +669,8 @@ endif
 # Move setup binary to dssetup
 	mv $(INSTDIR)/$(NS_BUILD_FLAVOR)/setup $(INSTDIR)/$(NS_BUILD_FLAVOR)/dssetup
 # Move the new setup wrappers into place
-	cp $(MCOM_ROOT)/ldapserver/ldap/cm/newinst/setup.pl $(INSTDIR)/$(NS_BUILD_FLAVOR)/setup.pl
-	cp $(MCOM_ROOT)/ldapserver/ldap/cm/newinst/setup.sh $(INSTDIR)/$(NS_BUILD_FLAVOR)/setup
+	cp $(BUILD_ROOT)/ldap/cm/newinst/setup.pl $(INSTDIR)/$(NS_BUILD_FLAVOR)/setup.pl
+	cp $(BUILD_ROOT)/ldap/cm/newinst/setup.sh $(INSTDIR)/$(NS_BUILD_FLAVOR)/setup
 
 # We need to package perl for the new setup wrapper to run
 	mkdir $(INSTDIR)/$(NS_BUILD_FLAVOR)/tmp
@@ -790,8 +790,8 @@ endif  # BUILD_SHIP
 
 cleanDirectory:
 	cd $(LDAPDIR); $(MAKE) clean
-	rm -rf $(MCOM_ROOT)/dist/$(NC_BUILD_FLAVOR)
-	rm -rf $(MCOM_ROOT)/ldapserver/built/$(NS_BUILD_FLAVOR)
+	rm -rf $(BUILD_ROOT)/../dist/$(NC_BUILD_FLAVOR)
+	rm -rf $(BUILD_ROOT)/built/$(NS_BUILD_FLAVOR)
 
 
 ifeq ($(ARCH), WINNT)
@@ -841,15 +841,15 @@ _admserv_files: $(INST_TARGET) $(ADMSERV_DEP)
 # move setup.exe to dssetup.exe
 	mv $(INST_TARGET)/setup.exe $(INST_TARGET)/dssetup.exe
 # copy in the new setup wrapper script
-	cp $(MCOM_ROOT)/ldapserver/ldap/cm/newinst/setup.pl $(INST_TARGET)
-	cp $(MCOM_ROOT)/ldapserver/ldap/cm/newinstnt/setup.bat $(INST_TARGET)
+	cp $(BUILD_ROOT)/ldap/cm/newinst/setup.pl $(INST_TARGET)
+	cp $(BUILD_ROOT)/ldap/cm/newinstnt/setup.bat $(INST_TARGET)
 
 
 #----------------------------  slapd rules --------------------------------------------------
 
 # Files which go in the distibution and which we make ourselves
-SLAPD_ZIPFILE=$(ABS_ROOT)/$(MMDD)/$(NS_BUILD_FLAVOR)/$(SLAPD_DIR)/slapd.z
-DSJARS_ZIPFILE=$(ABS_ROOT)/$(MMDD)/$(NS_BUILD_FLAVOR)/$(SLAPD_DIR)/dsjars.z
+SLAPD_ZIPFILE=$(ABS_ROOT_PARENT)/$(MMDD)/$(NS_BUILD_FLAVOR)/$(SLAPD_DIR)/slapd.z
+DSJARS_ZIPFILE=$(ABS_ROOT_PARENT)/$(MMDD)/$(NS_BUILD_FLAVOR)/$(SLAPD_DIR)/dsjars.z
 
 .PHONY: _slapd_files
 
@@ -937,4 +937,4 @@ $(INST_TARGET)/tools: $(INSTDIR)/$(NS_BUILD_FLAVOR)/tools/infozip.zip
 endif
 
 $(OBJDIR)/lib/libsi18n/ns-slapd.properties:
-	cd $(MCOM_ROOT)/ldapserver/lib/libsi18n ; $(MAKE) $(MFLAGS) all
+	cd $(BUILD_ROOT)/lib/libsi18n ; $(MAKE) $(MFLAGS) all
diff --git a/ldap/cm/newinst/Makefile b/ldap/cm/newinst/Makefile
index 9fa0867e..762ccfcb 100644
--- a/ldap/cm/newinst/Makefile
+++ b/ldap/cm/newinst/Makefile
@@ -15,13 +15,13 @@
 COMPONENT_DEPS := 1
 override USE_64=
 
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 LDAP_SRC = ../..
 
 MODULE=slapdInstallBin
 # override BUILD_MODULE = HTTP_ADMIN
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 test:
@@ -141,10 +141,10 @@ $(BINDEST)/ns-config: $(OBJS1) $(OBJS2)
 
 ifeq ($(ARCH), WINNT)
 $(INFO):
-	$(PERL) fixINF.pl $(BUILD_MODULE) $(DIR_VERSION) $(MCOM_ROOT)/ldapserver/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "bin/admin/ns-admin,bin/admin/ns-admin.so"
+	$(PERL) fixINF.pl $(BUILD_MODULE) $(DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "bin/admin/ns-admin,bin/admin/ns-admin.so"
 else
 $(INFO):
-	$(PERL) fixINF.pl $(BUILD_MODULE) $(DIR_VERSION) $(MCOM_ROOT)/ldapserver/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a"
+	$(PERL) fixINF.pl $(BUILD_MODULE) $(DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a"
 endif
 
 $(OBJDEST)/%.o: %.c
diff --git a/ldap/cm/newinstnt/Makefile b/ldap/cm/newinstnt/Makefile
index c7d3163a..5d711c90 100644
--- a/ldap/cm/newinstnt/Makefile
+++ b/ldap/cm/newinstnt/Makefile
@@ -12,12 +12,12 @@
 #
 #
 
-MCOM_ROOT=../../../..
-LDAP_SRC= $(MCOM_ROOT)/ldapserver/ldap
+BUILD_ROOT=../../..
+LDAP_SRC= $(BUILD_ROOT)/ldap
 
 NOSTDCLEAN=1
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 OUTDIR=$(OBJDIR)/setup
@@ -52,7 +52,7 @@ CONSOLOBJS= \
 LIBINSTOBJS = \
 	$(OUTDIR)/libinst.obj
 
-CFLAGS+= /I "$(MCOM_ROOT)/ldapserver/include/nt" /I "$(MCOM_ROOT)/ldapserver/ldap/include" /I "$(MCOM_ROOT)/ldapserver/include" $(ADMINUTIL_INCLUDE) $(NSPR_INCLUDE) /D "NS_DS" /D "XP_WIN32"
+CFLAGS+= /I "$(BUILD_ROOT)/include/nt" /I "$(BUILD_ROOT)/ldap/include" /I "$(BUILD_ROOT)/include" $(ADMINUTIL_INCLUDE) $(NSPR_INCLUDE) /D "NS_DS" /D "XP_WIN32"
 
 CC=cl.exe
 LD=link.exe
@@ -85,7 +85,7 @@ $(OUTDIR)/%.obj: %.c
 	$(CC) $(CFLAGS) $<
 
 $(OUTDIR)/%.inf: %.inf
-	$(PERL) $(FIXINF) $(BUILD_MODULE) $(DIR_VERSION) $(MCOM_ROOT)/ldapserver/$(BUILD_ARCH)/buildnum.dat $< $(SECURITY) "DoesntOnNT" $(IS_DIR_LITE) '$(INSTANCE_NAME_PREFIX)' $@ $(BUILD_BOMB)
+	$(PERL) $(FIXINF) $(BUILD_MODULE) $(DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat $< $(SECURITY) "DoesntOnNT" $(IS_DIR_LITE) '$(INSTANCE_NAME_PREFIX)' $@ $(BUILD_BOMB)
 
 $(OUTDIR)/%.res: %.rc
 	$(RC) $(RCFLAGS) /fo"$@" $<
diff --git a/ldap/docs/dirhlp/Makefile b/ldap/docs/dirhlp/Makefile
index 4d478ce9..87a2281a 100644
--- a/ldap/docs/dirhlp/Makefile
+++ b/ldap/docs/dirhlp/Makefile
@@ -9,13 +9,13 @@
 # GNU Makefile for Directory Server Console Help 
 #
 
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 LDAP_SRC = ../..
 MODULE=httpdAdminHTML
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 HTMLDEST=$(OBJDIR)/manual/slapd
diff --git a/ldap/include/Makefile b/ldap/include/Makefile
index cbd7c034..0a18d59f 100644
--- a/ldap/include/Makefile
+++ b/ldap/include/Makefile
@@ -10,14 +10,14 @@
 #
 
 LDAP_SRC = ..
-MCOM_ROOT = ../../..
+BUILD_ROOT = ../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
 NSPR20=true	# probably should be defined somewhere else (not sure where)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifneq ($(ARCH), WINNT)
diff --git a/ldap/include/Makefile.client b/ldap/include/Makefile.client
index e2c7ffe4..2864fce9 100644
--- a/ldap/include/Makefile.client
+++ b/ldap/include/Makefile.client
@@ -5,7 +5,7 @@
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
-DEPTH		= ../../..
+DEPTH		= ../..
 
 CHMOD		= chmod
 RM		= rm -f
@@ -30,7 +30,7 @@ DIRSDK_VERSION	:= 1.0
 
 ifeq ($(OS_ARCH), WINNT)
 # Is this correct?
-DIRVER_PATH	= $(DEPTH)/netsite/ldap/build
+DIRVER_PATH	= $(DEPTH)/ldap/build
 else
 DIRVER_PATH	= $(DIST)/bin
 endif
diff --git a/ldap/javarules.mk b/ldap/javarules.mk
index 8a35ba37..210a24c6 100644
--- a/ldap/javarules.mk
+++ b/ldap/javarules.mk
@@ -11,11 +11,11 @@
 # console
 
 # Where the source root is
-JAVA_SRC_DIR=$(ABS_ROOT)/ldapserver/ldap/admin/src/java
+JAVA_SRC_DIR=$(ABS_ROOT)/ldap/admin/src/java
 
 # Where the class files go
-JAVA_BUILD_DIR=$(ABS_ROOT)/ldapserver/built/java/$(BUILD_DEBUG)/admin
-JAVA_DEST_DIR=$(MCOM_ROOT)/ldapserver/built/java/$(BUILD_DEBUG)
+JAVA_BUILD_DIR=$(ABS_ROOT)/built/java/$(BUILD_DEBUG)/admin
+JAVA_DEST_DIR=$(BUILD_ROOT)/built/java/$(BUILD_DEBUG)
 CLASS_DIR=$(JAVA_DEST_DIR)/admin
 DSADMIN_DIR=$(CLASS_DIR)/com/netscape/admin
 
diff --git a/ldap/libraries/Makefile b/ldap/libraries/Makefile
index d174d131..4ea2dcd2 100644
--- a/ldap/libraries/Makefile
+++ b/ldap/libraries/Makefile
@@ -9,8 +9,8 @@
 # GNU Makefile for Directory Server and LDAP SDK libraries
 #
 
-MCOM_ROOT = ../../..
-LDAP_SRC = $(MCOM_ROOT)/ldapserver/ldap
+BUILD_ROOT = ../..
+LDAP_SRC = $(BUILD_ROOT)/ldap
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -19,13 +19,13 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib
 LIBDIR = $(LDAP_LIBDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 # the following lines are to make this work for
 # both db1.85 and db2.0
 ifndef LDAP_USE_OLD_DB
-include $(MCOM_ROOT)/ldapserver/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usedb.mk
 ldap_db_depend:=$(DB_LIB_DEP)
 CFLAGS+= -I$(DB_INCLUDE)
 else
@@ -307,7 +307,7 @@ DEFLDAPMACCLIENTPPC=$(MACDEFDIR)/LDAPClientPPC.prj
 DEFLDAPMACCLIENT68K=$(MACDEFDIR)/LDAPClient68K.prj
 
 # nsdefs.mk contains version number definitions....
-OTHERDEFDEPS=$(MCOM_ROOT)/ldapserver/nsdefs.mk
+OTHERDEFDEPS=$(BUILD_ROOT)/nsdefs.mk
 
 exportfiles:
 	$(MAKE) $(MFLAGS) WINDEFDIR=msdos/winsock doExportFiles
diff --git a/ldap/libraries/Makefile.client b/ldap/libraries/Makefile.client
index 5aa0ab20..139698fd 100644
--- a/ldap/libraries/Makefile.client
+++ b/ldap/libraries/Makefile.client
@@ -5,7 +5,7 @@
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
-DEPTH		= ../../..
+DEPTH		= ../..
 UNIXDIRLIST	= liblber libldap
 
 include $(DEPTH)/config/rules.mk
diff --git a/ldap/libraries/libavl/Makefile b/ldap/libraries/libavl/Makefile
index 28660d4d..44a8c8f0 100644
--- a/ldap/libraries/libavl/Makefile
+++ b/ldap/libraries/libavl/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../..
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -19,8 +19,8 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libavl
 LIBDIR = $(LDAP_LIBDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 CFLAGS +=	$(SLCFLAGS)
diff --git a/ldap/libraries/libldif/Makefile b/ldap/libraries/libldif/Makefile
index 5420662c..726c559b 100644
--- a/ldap/libraries/libldif/Makefile
+++ b/ldap/libraries/libldif/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../..
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -19,8 +19,8 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libldif
 LIBDIR = $(LDAP_LIBDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 CFLAGS +=	$(SLCFLAGS)
diff --git a/ldap/libraries/liblitekey/Makefile b/ldap/libraries/liblitekey/Makefile
index 27e6d942..92577d1a 100644
--- a/ldap/libraries/liblitekey/Makefile
+++ b/ldap/libraries/liblitekey/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../..
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -19,8 +19,8 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/liblitekey
 LIBDIR = $(LDAP_LIBDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 CFLAGS +=	$(SLCFLAGS)
diff --git a/ldap/libraries/libutil/Makefile b/ldap/libraries/libutil/Makefile
index 6920ec86..cf9d9a91 100644
--- a/ldap/libraries/libutil/Makefile
+++ b/ldap/libraries/libutil/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../..
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -19,8 +19,8 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libutil
 LIBDIR = $(LDAP_LIBDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 #
@@ -39,7 +39,7 @@ LIBUTIL=	$(addprefix $(LIBDIR)/, libutil.$(LIB_SUFFIX))
 
 INCLUDES += -I$(LDAP_SRC)/servers/slapd -I$(OBJDIR)/include
 
-SLAPDMESSAGES_H=$(MCOM_ROOT)/ldapserver/ldap/include/ntslapdmessages.h
+SLAPDMESSAGES_H=$(BUILD_ROOT)/ldap/include/ntslapdmessages.h
 
 ifeq ($(LDAP_NO_LIBLCACHE),1)
 CFLAGS+=-DNO_LIBLCACHE
@@ -57,7 +57,7 @@ $(LIBUTIL): $(OBJS)
 
 $(SLAPDMESSAGES_H):
 	@echo target: $@
-	cd $(MCOM_ROOT)/ldapserver/ldap/servers/slapd/ntmsgdll; $(MAKE) $(MFLAGS)
+	cd $(BUILD_ROOT)/ldap/servers/slapd/ntmsgdll; $(MAKE) $(MFLAGS)
 
 veryclean: clean
 
diff --git a/ldap/nsldap.mk b/ldap/nsldap.mk
index 220aca5b..7c19f73c 100644
--- a/ldap/nsldap.mk
+++ b/ldap/nsldap.mk
@@ -17,28 +17,28 @@
 # This stuff is for UNIX--we wire in absolute paths
 # because it makes the tar'ing easier.
 # On NT we don't bother with this trick.
-# Note that we're setting MCOM_ROOT again,
+# Note that we're setting BUILD_ROOT again,
 # having set it to a relative path above, so
 # we can find the include files.
 ifneq ($(ARCH), WINNT)
 # This seems useless to check for a path of the form word:word if the arch
 # is neq winnt . . .
-MCOM_TMP = $(subst :, , $(shell cd ../../..;pwd))
-MCOM_WORDS = $(words $(MCOM_TMP))
-# convert MCOM_ROOT from relative path to absolute
-#MCOM_ROOT = $(word $(MCOM_WORDS), $(MCOM_TMP))
-ifneq ($(MCOM_WORDS), 1)
-MCOM_DRIVE = $(word 1, $(MCOM_TMP)):
+BUILD_TMP = $(subst :, , $(shell cd ../../..;pwd))
+BUILD_WORDS = $(words $(BUILD_TMP))
+# convert BUILD_ROOT from relative path to absolute
+#BUILD_ROOT = $(word $(BUILD_WORDS), $(BUILD_TMP))
+ifneq ($(BUILD_WORDS), 1)
+BUILD_DRIVE = $(word 1, $(BUILD_TMP)):
 endif
 endif
 
-RELTOP=$(MCOM_ROOT)/ldapserver/built/release
+RELTOP=$(BUILD_ROOT)/built/release
 OBJDIR_BASE = $(notdir $(OBJDIR))
 OBJDIR_BASE_32 = $(notdir $(OBJDIR_32))
 # Release directory for Directory Server
-RELDIR = $(MCOM_DRIVE)$(RELTOP)/$(DIR)/$(OBJDIR_BASE)
-RELDIR_32 = $(MCOM_DRIVE)$(RELTOP)/$(DIR)/$(OBJDIR_BASE_32)
-RELDIR_UNSTRIP = $(MCOM_DRIVE)$(RELTOP)/$(DIR)/$(ARCHPROCESSOR)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-unstripped-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR)
+RELDIR = $(BUILD_DRIVE)$(RELTOP)/$(DIR)/$(OBJDIR_BASE)
+RELDIR_32 = $(BUILD_DRIVE)$(RELTOP)/$(DIR)/$(OBJDIR_BASE_32)
+RELDIR_UNSTRIP = $(BUILD_DRIVE)$(RELTOP)/$(DIR)/$(ARCHPROCESSOR)$(NS64TAG)-$(SECURITY)$(SSL_PREFIX)-$(DEBUG)$(RTSUFFIX)-unstripped-$(BUILD_FORTEZZA)$(BUILD_PTHREADS)-$(DIR)
 
 # this is the place libraries and plugins go which are used by other
 # components i.e. not specific to slapd and its programs
@@ -68,7 +68,7 @@ else # same place as dll
 LDAP_ADMLIBDIR = $(LDAP_ADMDLLDIR)
 endif
 
-LDAP_SRC = $(MCOM_ROOT)/ldapserver/ldap
+LDAP_SRC = $(BUILD_ROOT)/ldap
 
 LDAP_INSTROOT= $(OBJDIR)
 
@@ -514,6 +514,11 @@ NTSYNCH_DLL=ntsynch-plugin$(DLL_PRESUFFIX)
 PASSTHRU_DLL = passthru-plugin$(DLL_PRESUFFIX)
 
 #
+# Dynamic library, PAM PASS THROUGH AUTHENTICATION PLUGIN
+#
+PAM_PASSTHRU_DLL = pam-passthru-plugin$(DLL_PRESUFFIX)
+
+#
 # Dynamic library, UNIQUE UID CHECKING PLUGIN
 #
 UID_DLL = attr-unique-plugin$(DLL_RESUFFIX)
@@ -581,7 +586,7 @@ endif # SOLARIS
 endif # HPUX
 
 ifeq ($(BUILD_MODULE), HTTP_ADMIN)
-ADMININCLUDEDIR = $(MCOM_ROOT)/ldapserver/include
+ADMININCLUDEDIR = $(BUILD_ROOT)/include
 endif
 
 ifndef ADMSONAME
@@ -677,8 +682,8 @@ else
 #DL=-ldl
 #
 #the new default, which is much better when it comes to porting this product
-NSHTTPD="you need to edit ldapserver/ldap/nsldap.mk for $(ARCH)"
-DYN_NSHTTPD="you need to edit ldapserver/ldap/nsldap.mk for $(ARCH)"
+NSHTTPD="you need to edit ldap/nsldap.mk for $(ARCH)"
+DYN_NSHTTPD="you need to edit ldap/nsldap.mk for $(ARCH)"
 endif # UnixWare
 endif # ReliantUNIX
 endif # Linux
@@ -693,7 +698,7 @@ endif # WINNT
 
 ADMIN_SECGLUEOBJ=$(BASIC_OBJDIR)-admin/admin-lib/secglue.o
 
-SECGLUEOBJ=$(MCOM_ROOT)/ldapserver/built/$(NS_BUILD_FLAVOR)/httpd-lib/secglue.o
+SECGLUEOBJ=$(BUILD_ROOT)/built/$(NS_BUILD_FLAVOR)/httpd-lib/secglue.o
 # XXXggood need to pick up the /share/builds versions of the shared libs
 # because ones we build here don't appear to be compatible with existing
 # shared libs, which are used by admin server.
@@ -875,10 +880,6 @@ DYNAMIC_DEPLIBS=$(LDAP_COMMON_LIBS)
 DYNAMIC_DEPLINK=$(LDAP_COMMON_LIBS)
 endif
 
-ifeq ($(ARCH), WINNT)
-LIBDBM_LIB =	$(MCOM_ROOT)/dist/$(NSOBJDIR_NAME)/lib/libdbm.lib
-endif
-
 ifndef DEPLIBS
 DEPLIBS = $(DYNAMIC_DEPLIBS)
 DEPLINK = $(DYNAMIC_DEPLINK)
@@ -897,7 +898,7 @@ HTMLDEFS=-DPRODUCT_NAME=$(PRODUCT) -D$(ARCH) -DARCH=$(PRETTY_ARCH)
 #
 ifeq ($(ARCH), WINNT)
 
-PLATFORM_INCLUDE = -I$(MCOM_ROOT)/ldapserver/include/nt \
+PLATFORM_INCLUDE = -I$(BUILD_ROOT)/include/nt \
     -I$(LDAP_SRC)/libraries/libutil
 
 SYSERRLIST_IN_STDIO=-DSYSERRLIST_IN_STDIO
@@ -1130,8 +1131,8 @@ PLATFORMCFLAGS=	-D_AIX32_CURSES -DUSE_PTHREADS -DHW_THREADS \
 PLATFORMLIBS= 
 THREADS= -DTHREAD_AIX_PTHREADS
 #SECGLUE= moresecglue.o \
-#        $(MCOM_ROOT)/nspr/src/$(NC_BUILD_FLAVOR)/longlong.o \
-#        $(MCOM_ROOT)/nspr/src/$(NC_BUILD_FLAVOR)/prprf.o
+#        $(BUILD_ROOT)/nspr/src/$(NC_BUILD_FLAVOR)/longlong.o \
+#        $(BUILD_ROOT)/nspr/src/$(NC_BUILD_FLAVOR)/prprf.o
 
 # JCM - Use -bnoquiet to find out which symbols can't be resolved.
 DLL_LDFLAGS= -bexpall -brtl -bM:SRE -bnoentry \
@@ -1266,7 +1267,7 @@ endif #UNIXWARE
 
 ifeq ($(ARCH), UnixWare)
 # Gemini: UnixWare7 (SVR5), or UNIXWARE2.1.x (SVR4) with the UDK
-SYSV_REL := $(shell $(MCOM_ROOT)/ldapserver/nsarch -f | sed 's/UnixWare //')
+SYSV_REL := $(shell $(BUILD_ROOT)/nsarch -f | sed 's/UnixWare //')
 ifeq ($(SYSV_REL),5)
 PLAT_ADMCFLAGS= -DUnixWare -DSVR5 -DSYSV
 PLATFORMCFLAGS= -DUnixWare -DSYSV -DSVR5
@@ -1745,7 +1746,7 @@ INCLUDES += -I$(LIBDB_MAKEDIR)/include
 endif
 
 #Changes required for ACL
-ACLINC = $(MCOM_ROOT)/ldapserver/include/libaccess
+ACLINC = $(BUILD_ROOT)/include/libaccess
 #ACLDIR = -$(LIBPATH)$(LDAP_LIBDIR)
 ACLLIB = -laccess -lbase -lsi18n
 # end of changes
diff --git a/ldap/servers/Makefile b/ldap/servers/Makefile
index a02d82c8..65a20698 100644
--- a/ldap/servers/Makefile
+++ b/ldap/servers/Makefile
@@ -8,15 +8,15 @@
 # GNU Makefile for ldap/servers
 #
 
-MCOM_ROOT = ../../..
+BUILD_ROOT = ../..
 LDAP_SRC = ../
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
 NSPR20=true	# probably should be defined somewhere else (not sure where)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/Makefile b/ldap/servers/plugins/Makefile
index 17da03ff..a743f9e4 100644
--- a/ldap/servers/plugins/Makefile
+++ b/ldap/servers/plugins/Makefile
@@ -9,14 +9,14 @@
 # GNU Makefile for Directory Server and LDAP SDK libraries
 #
 
-MCOM_ROOT = ../../../..
-LDAP_SRC = $(MCOM_ROOT)/ldapserver/ldap
+BUILD_ROOT = ../../..
+LDAP_SRC = $(BUILD_ROOT)/ldap
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
 NSPR20=true	# probably should be defined somewhere else (not sure where)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 all: _referint _collation _syntaxes _passthru _utils _uiduniq _roles _acl _replication _cos _pwdstorage _rever _chainingdb _distrib _retrocl _statechange _http _views 
diff --git a/ldap/servers/plugins/acl/Makefile b/ldap/servers/plugins/acl/Makefile
index bdfe2dc0..e58ef5a3 100644
--- a/ldap/servers/plugins/acl/Makefile
+++ b/ldap/servers/plugins/acl/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -19,7 +19,7 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libacl
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 # ACL plugin depends on libadminutil
diff --git a/ldap/servers/plugins/chainingdb/Makefile b/ldap/servers/plugins/chainingdb/Makefile
index 4f47e480..14e7f598 100644
--- a/ldap/servers/plugins/chainingdb/Makefile
+++ b/ldap/servers/plugins/chainingdb/Makefile
@@ -11,7 +11,7 @@
 
 LDAP_SRC = ../../..
 
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -20,7 +20,7 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libcb
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/collation/Makefile b/ldap/servers/plugins/collation/Makefile
index 14619af7..927faf6d 100644
--- a/ldap/servers/plugins/collation/Makefile
+++ b/ldap/servers/plugins/collation/Makefile
@@ -6,7 +6,7 @@
 # END COPYRIGHT BLOCK
 #
 LDAP_SRC= ../../..
-MCOM_ROOT= ../../../../..
+BUILD_ROOT= ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -15,7 +15,7 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST= $(OBJDIR)/lib/liblcoll
 LIBDIR= $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 INCLUDES+= -I../../slapd  -I../../../include 
@@ -32,7 +32,7 @@ EXTRA_LIBS_DEP+= $(LIBSLAPD_DEP)
 EXTRA_LIBS_DEP+=$(LDAPSDK_DEP)
 endif
 
-# INCLUDES+= -I. -I$(ACLINC) -I$(MCOM_ROOT)/ldapserver/lib
+# INCLUDES+= -I. -I$(ACLINC) -I$(BUILD_ROOT)/lib
 
 # ICU stuff
 INCLUDES+= $(ICU_INCLUDE)
diff --git a/ldap/servers/plugins/cos/Makefile b/ldap/servers/plugins/cos/Makefile
index de540f5a..7f4779e3 100644
--- a/ldap/servers/plugins/cos/Makefile
+++ b/ldap/servers/plugins/cos/Makefile
@@ -6,7 +6,7 @@
 # END COPYRIGHT BLOCK
 #
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -15,8 +15,8 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libcos
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/distrib/Makefile b/ldap/servers/plugins/distrib/Makefile
index 3144e8cb..3f26ca76 100644
--- a/ldap/servers/plugins/distrib/Makefile
+++ b/ldap/servers/plugins/distrib/Makefile
@@ -9,7 +9,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -18,7 +18,7 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libdistrib
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/http/Makefile b/ldap/servers/plugins/http/Makefile
index d23c26a5..7ddbb543 100644
--- a/ldap/servers/plugins/http/Makefile
+++ b/ldap/servers/plugins/http/Makefile
@@ -5,7 +5,7 @@
 # All rights reserved.
 # 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -14,8 +14,8 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libhttpclient
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/passthru/Makefile b/ldap/servers/plugins/passthru/Makefile
index 11540915..2a099591 100644
--- a/ldap/servers/plugins/passthru/Makefile
+++ b/ldap/servers/plugins/passthru/Makefile
@@ -11,7 +11,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -20,7 +20,7 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libpassthru
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/presence/Makefile b/ldap/servers/plugins/presence/Makefile
index 9b15bc96..2ffbeedf 100644
--- a/ldap/servers/plugins/presence/Makefile
+++ b/ldap/servers/plugins/presence/Makefile
@@ -6,7 +6,7 @@
 # END COPYRIGHT BLOCK
 #
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -15,8 +15,8 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libpresence
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/pwdstorage/Makefile b/ldap/servers/plugins/pwdstorage/Makefile
index efad0788..1478dca2 100644
--- a/ldap/servers/plugins/pwdstorage/Makefile
+++ b/ldap/servers/plugins/pwdstorage/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -19,7 +19,7 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libpwdstorage
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/referint/Makefile b/ldap/servers/plugins/referint/Makefile
index acf09c42..be2f99e7 100644
--- a/ldap/servers/plugins/referint/Makefile
+++ b/ldap/servers/plugins/referint/Makefile
@@ -6,7 +6,7 @@
 # END COPYRIGHT BLOCK
 #
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -15,7 +15,7 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/referint-plugin
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/replication/Makefile b/ldap/servers/plugins/replication/Makefile
index 6f5341e8..cdcc4f7d 100644
--- a/ldap/servers/plugins/replication/Makefile
+++ b/ldap/servers/plugins/replication/Makefile
@@ -11,7 +11,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -20,9 +20,9 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/replication-plugin
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
-include $(MCOM_ROOT)/ldapserver/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usedb.mk
 
 ifeq ($(ARCH), WINNT)
 DEF_FILE:=./replication.def
diff --git a/ldap/servers/plugins/replication/tests/makesim b/ldap/servers/plugins/replication/tests/makesim
index 0cedd6e1..b92d6970 100755
--- a/ldap/servers/plugins/replication/tests/makesim
+++ b/ldap/servers/plugins/replication/tests/makesim
@@ -7,7 +7,7 @@
 # gnu makefile for LDAP Server tools.
 #
 
-MCOM_ROOT = ../../../../../..
+BUILD_ROOT = ../../../../..
 LDAP_SRC = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
@@ -16,8 +16,8 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
 OBJDEST = $(OBJDIR)/lib/replication-plugin
 BINDIR = $(OBJDIR)/bin
 
-include $(MCOM_ROOT)/netsite/nsdefs.mk
-include $(MCOM_ROOT)/netsite/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 LDFLAGS	+= $(EXLDFLAGS)
diff --git a/ldap/servers/plugins/retrocl/Makefile b/ldap/servers/plugins/retrocl/Makefile
index c81f0dfe..a4911ddd 100644
--- a/ldap/servers/plugins/retrocl/Makefile
+++ b/ldap/servers/plugins/retrocl/Makefile
@@ -9,7 +9,7 @@
 # GNU Makefile for Directory Server "Retrocl" plugin
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -19,10 +19,10 @@ OBJDEST = $(OBJDIR)/lib/retrocl-plugin
 BINDIR = $(LDAP_SERVER_RELDIR)
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
-include $(MCOM_ROOT)/ldapserver/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usedb.mk
 INCLUDES+=-I$(DB_INCLUDE)
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/rever/Makefile b/ldap/servers/plugins/rever/Makefile
index 76203a9c..ce037e29 100644
--- a/ldap/servers/plugins/rever/Makefile
+++ b/ldap/servers/plugins/rever/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -19,8 +19,8 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libdes
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
-include $(MCOM_ROOT)/ldapserver/ns_usepurify.mk
+include $(BUILD_ROOT)/nsconfig.mk
+include $(BUILD_ROOT)/ns_usepurify.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
@@ -30,7 +30,7 @@ endif
 CFLAGS+=$(SLCFLAGS)
 
 INCLUDES += -I$(LDAP_SRC)/servers/slapd
-INCLUDES += -I$(MCOM_ROOT)/ldapserver/ldap/include
+INCLUDES += -I$(BUILD_ROOT)/ldap/include
 
 REVER_OBJS= \
 	rever.o des.o
diff --git a/ldap/servers/plugins/roles/Makefile b/ldap/servers/plugins/roles/Makefile
index 2e936fad..2e1a26ca 100644
--- a/ldap/servers/plugins/roles/Makefile
+++ b/ldap/servers/plugins/roles/Makefile
@@ -6,7 +6,7 @@
 # END COPYRIGHT BLOCK
 #
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -18,8 +18,8 @@ ifndef INSTDIR
 INSTDIR = c:/netscape/server4/
 endif
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/shared/Makefile b/ldap/servers/plugins/shared/Makefile
index 847735ee..0370f8e4 100644
--- a/ldap/servers/plugins/shared/Makefile
+++ b/ldap/servers/plugins/shared/Makefile
@@ -11,7 +11,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 SHARED=shared
 
@@ -22,8 +22,8 @@ NOSTDSTRIP=true # don't let nsconfig.mk define target strip
 OBJDEST = $(OBJDIR)/lib/$(SHARED)
 LIBDIR = $(LDAP_LIBDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 CFLAGS+=$(SLCFLAGS)
diff --git a/ldap/servers/plugins/statechange/Makefile b/ldap/servers/plugins/statechange/Makefile
index bc04a3f0..07c33c5b 100644
--- a/ldap/servers/plugins/statechange/Makefile
+++ b/ldap/servers/plugins/statechange/Makefile
@@ -6,7 +6,7 @@
 # END COPYRIGHT BLOCK
 #
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -15,8 +15,8 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libstatechange
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/syntaxes/Makefile b/ldap/servers/plugins/syntaxes/Makefile
index edc9bd9c..a818e0cf 100644
--- a/ldap/servers/plugins/syntaxes/Makefile
+++ b/ldap/servers/plugins/syntaxes/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -19,7 +19,7 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libsyntax
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/uiduniq/Makefile b/ldap/servers/plugins/uiduniq/Makefile
index 79b95995..004b9642 100644
--- a/ldap/servers/plugins/uiduniq/Makefile
+++ b/ldap/servers/plugins/uiduniq/Makefile
@@ -11,7 +11,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -21,7 +21,7 @@ OBJDEST = $(OBJDIR)/lib/libuidunique
 LIBDIR = $(LIB_RELDIR)
 SHAREDLIB = $(OBJDIR)/lib/shared/utils.o
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/vattrsp_template/Makefile b/ldap/servers/plugins/vattrsp_template/Makefile
index 0eb9e072..fb2c9062 100644
--- a/ldap/servers/plugins/vattrsp_template/Makefile
+++ b/ldap/servers/plugins/vattrsp_template/Makefile
@@ -6,7 +6,7 @@
 # END COPYRIGHT BLOCK
 #
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -15,8 +15,8 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libvattrsp
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/plugins/views/Makefile b/ldap/servers/plugins/views/Makefile
index 495c7d97..d0d42f06 100644
--- a/ldap/servers/plugins/views/Makefile
+++ b/ldap/servers/plugins/views/Makefile
@@ -6,7 +6,7 @@
 # END COPYRIGHT BLOCK
 #
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -15,8 +15,8 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libviews
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
diff --git a/ldap/servers/slapd/Makefile b/ldap/servers/slapd/Makefile
index dc342de7..dc33916f 100644
--- a/ldap/servers/slapd/Makefile
+++ b/ldap/servers/slapd/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../..
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -22,11 +22,11 @@ ifndef INSTDIR
 INSTDIR = /netscape/server4/
 endif
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
-include $(MCOM_ROOT)/ldapserver/ns_usepurify.mk
-include $(MCOM_ROOT)/ldapserver/ns_usequantify.mk
+include $(BUILD_ROOT)/ns_usepurify.mk
+include $(BUILD_ROOT)/ns_usequantify.mk
 include $(LDAP_SRC)/nsdeps.mk
 
 
@@ -64,19 +64,19 @@ LDAP_DONT_USE_SMARTHEAP=1
 endif
 
 ifndef LDAP_DONT_USE_SMARTHEAP
-include $(MCOM_ROOT)/ldapserver/ns_usesh.mk
+include $(BUILD_ROOT)/ns_usesh.mk
 INCLUDES+=-I$(SH_INCLUDE)
 else
 CFLAGS+=-DLDAP_DONT_USE_SMARTHEAP
 endif
 
 ifndef LDAP_USE_OLD_DB
-include $(MCOM_ROOT)/ldapserver/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usedb.mk
 _ldap_db_depend:=$(DB_LIB_DEP)
 INCLUDES+=-I$(DB_INCLUDE)
 endif
 
-INCLUDES += -I. -I$(ACLINC) -I$(MCOM_ROOT)/ldapserver/lib
+INCLUDES += -I. -I$(ACLINC) -I$(BUILD_ROOT)/lib
 
 #ICONS = $(addprefix $(LDAP_SRC)/servers/slapd/ntwdog/, logo.ico key.ico) 
 
diff --git a/ldap/servers/slapd/back-ldbm/Makefile b/ldap/servers/slapd/back-ldbm/Makefile
index f570d7e3..3fefc207 100644
--- a/ldap/servers/slapd/back-ldbm/Makefile
+++ b/ldap/servers/slapd/back-ldbm/Makefile
@@ -9,7 +9,7 @@
 # GNU Makefile for Directory Server libback-ldbm
 #
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -21,10 +21,10 @@ ifndef INSTDIR
 INSTDIR = /netscape/server4/
 endif
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 ifndef LDAP_USE_OLD_DB
-include $(MCOM_ROOT)/ldapserver/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usedb.mk
 INCLUDES+=-I$(DB_INCLUDE)
 else
 CFLAGS+=-DLDAP_USE_DB185
diff --git a/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile b/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
index 7b41ae90..dffcba37 100644
--- a/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
+++ b/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
@@ -10,15 +10,15 @@
 #
 
 LDAP_SRC = ../../../../..
-MCOM_ROOT = ../../../../../../..
+BUILD_ROOT = ../../../../../..
 
 OBJDEST = $(OBJDIR)/lib/libback-ldbm
 LIBDIR = $(LDAP_LIBDIR)
 
-include $(MCOM_ROOT)/netsite/nsdefs.mk
-include $(MCOM_ROOT)/netsite/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
-include $(MCOM_ROOT)/netsite/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usedb.mk
 
 INCLUDES += -I$(LDAP_SRC)/servers/slapd
 
diff --git a/ldap/servers/slapd/back-ldif/Makefile b/ldap/servers/slapd/back-ldif/Makefile
index 1b7037cd..3c7f2e6e 100644
--- a/ldap/servers/slapd/back-ldif/Makefile
+++ b/ldap/servers/slapd/back-ldif/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -20,8 +20,8 @@ OBJDEST = $(OBJDIR)/lib/libback-ldif
 LIBDIR = $(LDAP_LIBDIR)
 SERVER_OBJDEST = $(OBJDIR)/servers/obj
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 BACKLDIF_OBJS	= close.o delete.o modrdn.o unbind.o add.o \
diff --git a/ldap/servers/slapd/libmakefile b/ldap/servers/slapd/libmakefile
index 8eaf4604..48599132 100644
--- a/ldap/servers/slapd/libmakefile
+++ b/ldap/servers/slapd/libmakefile
@@ -11,7 +11,7 @@
 
 FLAG_LDAP_4SLAPD=true
 LDAP_SRC = ../..
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -24,17 +24,17 @@ ifndef INSTDIR
 INSTDIR = /netscape/server4/
 endif
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 ifndef LDAP_USE_OLD_DB
-include $(MCOM_ROOT)/ldapserver/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usedb.mk
 _ldap_db_depend:=$(DB_LIB_DEP)
 INCLUDES+=-I$(DB_INCLUDE)
 endif
 include $(LDAP_SRC)/nsdeps.mk
 
-INCLUDES += -I. -I$(MCOM_ROOT)/ldapserver/lib
+INCLUDES += -I. -I$(BUILD_ROOT)/lib
 # uncomment the following to include support in slapd for hacky echo control
 #CFLAGS += -DSLAPD_ECHO_CONTROL
 CFLAGS+=$(SLCFLAGS)
diff --git a/ldap/servers/slapd/libsh_stub/Makefile b/ldap/servers/slapd/libsh_stub/Makefile
index d82833c0..6e555a14 100644
--- a/ldap/servers/slapd/libsh_stub/Makefile
+++ b/ldap/servers/slapd/libsh_stub/Makefile
@@ -9,14 +9,14 @@
 # GNU Makefile for libsh_stub.so
 #
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
 
 OBJDEST = $(OBJDIR)/lib/libsh_stub
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 include $(LDAP_SRC)/nsdeps.mk
 
diff --git a/ldap/servers/slapd/ntmsgdll/Makefile b/ldap/servers/slapd/ntmsgdll/Makefile
index 06b7a1bc..51b15e91 100644
--- a/ldap/servers/slapd/ntmsgdll/Makefile
+++ b/ldap/servers/slapd/ntmsgdll/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -19,7 +19,7 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/ntmsgdll/obj
 BINDIR = $(LDAP_SERVER_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 MSGFILE = slapdmessages30
diff --git a/ldap/servers/slapd/ntperfdll/Makefile b/ldap/servers/slapd/ntperfdll/Makefile
index bed046a6..b0c7072c 100644
--- a/ldap/servers/slapd/ntperfdll/Makefile
+++ b/ldap/servers/slapd/ntperfdll/Makefile
@@ -6,15 +6,15 @@
 # END COPYRIGHT BLOCK
 #
 
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 LDAP_SRC = ../../..
 
 OBJDEST = $(OBJDIR)/servers/obj
 BINDIR = $(LDAP_SERVER_RELDIR)
 ALLDIRS = $(BINDIR) $(OBJDEST)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 LINK32=link.exe
@@ -26,7 +26,7 @@ DLLS = nsldapctr
 # -D's get all screwed up: we need to fix them:
 CFLAGS+= -UNS_PERSONAL -DNS_DS
 # this lets us pickup regparms.h
-CFLAGS += -I $(MCOM_ROOT)/ldapserver/include
+CFLAGS += -I $(BUILD_ROOT)/include
 
 MCS = nsldapctrmc
 DEPMC = $(addsuffix .h, $(MCS))
diff --git a/ldap/servers/slapd/ntwdog/Makefile b/ldap/servers/slapd/ntwdog/Makefile
index f727232c..4cefe026 100644
--- a/ldap/servers/slapd/ntwdog/Makefile
+++ b/ldap/servers/slapd/ntwdog/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -21,14 +21,14 @@ SLAPD_OBJDEST= $(OBJDIR)/obj
 BINDIR = $(LDAP_SERVER_RELDIR)
 LDAP_LIBDIR = $(OBJDIR)/lib
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), WINNT)
 SUBSYSTEM=windows
 endif
 
-#INCLUDES += -I$(MCOM_ROOT)/ldapserver/include/libadmin 
+#INCLUDES += -I$(BUILD_ROOT)/include/libadmin 
 
 DS_SERVER_DEFS = -DNS_DS
 
diff --git a/ldap/servers/slapd/test-plugins/Makefile b/ldap/servers/slapd/test-plugins/Makefile
index 8b78aada..08cdf854 100644
--- a/ldap/servers/slapd/test-plugins/Makefile
+++ b/ldap/servers/slapd/test-plugins/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -20,11 +20,11 @@ OBJDEST = $(OBJDIR)/servers/obj
 BINDIR = $(OBJDIR)/bin
 LIBDIR = $(OBJDIR)/lib
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
-include $(MCOM_ROOT)/ldapserver/ns_usepurify.mk
-include $(MCOM_ROOT)/ldapserver/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usepurify.mk
+include $(BUILD_ROOT)/ns_usedb.mk
 
 
 EXTRA_INCLUDES=-I.. -I../../../include $(NSPR_INCLUDE) -I$(LDAP_INCLUDE) -I$(DB_INCLUDE) -I../../../servers/slapd -g
diff --git a/ldap/servers/slapd/test-plugins/Makefile.server b/ldap/servers/slapd/test-plugins/Makefile.server
index 4923aa38..09a4ac81 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.server
+++ b/ldap/servers/slapd/test-plugins/Makefile.server
@@ -9,7 +9,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -18,9 +18,9 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/lib/libtestplug
 LIBDIR = $(LIB_RELDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
-include $(MCOM_ROOT)/ldapserver/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usedb.mk
 
 ifeq ($(ARCH), WINNT)
 DEF_FILE:=./libdistrib.def
diff --git a/ldap/servers/slapd/tools/Makefile b/ldap/servers/slapd/tools/Makefile
index abd9fda1..5b423d2a 100644
--- a/ldap/servers/slapd/tools/Makefile
+++ b/ldap/servers/slapd/tools/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ../../..
-MCOM_ROOT = ../../../../..
+BUILD_ROOT = ../../../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -21,11 +21,11 @@ BINDIR = $(LDAP_SERVER_RELDIR)
 
 SLAPD_OBJDIR = $(LDAP_OBJDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 ifndef LDAP_USE_OLD_DB
-include $(MCOM_ROOT)/ldapserver/ns_usedb.mk
+include $(BUILD_ROOT)/ns_usedb.mk
 INCLUDES+=-I$(DB_INCLUDE)
 else
 CFLAGS+=-DLDAP_USE_DB185
@@ -111,7 +111,7 @@ endif
 endif
 
 ifndef LDAP_DONT_USE_SMARTHEAP
-include $(MCOM_ROOT)/ldapserver/ns_usesh.mk
+include $(BUILD_ROOT)/ns_usesh.mk
 _smartheap_depend = $(SH_LIB_DEP)
 else
 CFLAGS+=-DLDAP_DONT_USE_SMARTHEAP
diff --git a/ldap/servers/snmp/Makefile b/ldap/servers/snmp/Makefile
index 4e40d8c0..20949b8a 100644
--- a/ldap/servers/snmp/Makefile
+++ b/ldap/servers/snmp/Makefile
@@ -15,7 +15,7 @@
 #	
 #  
 
-MCOM_ROOT = ../../../..
+BUILD_ROOT = ../../..
 LDAP_SRC = ../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
@@ -27,14 +27,14 @@ INCLDEST = $(OBJDIR)/ns-ldapagt/include
 BINDIR = $(LDAP_SERVER_RELDIR)
 EXTDEST = $(BINDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 MCC_SERVER=
 
 ARCH := $(shell uname -s)
 ifneq ($(ARCH), WINNT)
-ARCH := $(shell $(MCOM_ROOT)/ldapserver/nsarch)
+ARCH := $(shell $(BUILD_ROOT)/nsarch)
 endif
 
 
diff --git a/ldap/servers/snmp/ntagt/Makefile b/ldap/servers/snmp/ntagt/Makefile
index 22605b2f..bb4c0d22 100644
--- a/ldap/servers/snmp/ntagt/Makefile
+++ b/ldap/servers/snmp/ntagt/Makefile
@@ -9,7 +9,7 @@
 #                       SNMP NT Subagent Common Rulesets                    #
 #############################################################################
 
-MCOM_ROOT   =   ../../../../..
+BUILD_ROOT   =   ../../../..
 MSRV_ROOT   =   ../../..
 SLAPD_ROOT  =   $(MSRV_ROOT)/servers/slapd
 SNMP_ROOT   =   $(MSRV_ROOT)/servers/snmp
@@ -20,12 +20,12 @@ NOSTDCLEAN = true # don't let nsconfig.mk define target clean
 NOSTDSTRIP = true # don't let nsconfig.mk define target strip
 NSPR20     = true
 
-include         $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include         $(BUILD_ROOT)/nsconfig.mk
 include         $(MSRV_ROOT)/nsldap.mk
 
 OBJ_SUFFIX  = obj
 
-INCLUDES    +=   -I../../slapd -I$(MCOM_ROOT)/ldapserver/ldap/include
+INCLUDES    +=   -I../../slapd -I$(BUILD_ROOT)/ldap/include
 
 CCOPTS      +=  $(CFLAGS) $(DLL_CFLAGS) $(MCC_INCLUDE) $(INCLUDES) -I$(SNMP_ROOT) 
 CXXOPTS     +=  $(CFLAGS) $(DLL_CXXFLAGS) $(MCC_INCLUDE) $(INCLUDES) -I$(SNMP_ROOT) 
diff --git a/ldap/systools/Makefile b/ldap/systools/Makefile
index 969c3b95..ab0b315f 100644
--- a/ldap/systools/Makefile
+++ b/ldap/systools/Makefile
@@ -10,7 +10,7 @@
 #
 
 LDAP_SRC = ..
-MCOM_ROOT = ../../..
+BUILD_ROOT = ../..
 
 NOSTDCLEAN=true # don't let nsconfig.mk define target clean
 NOSTDSTRIP=true # don't let nsconfig.mk define target strip
@@ -21,8 +21,8 @@ BINDIR = $(LDAP_SERVER_RELDIR)
 
 SLAPD_OBJDIR = $(LDAP_OBJDIR)
 
-include $(MCOM_ROOT)/ldapserver/nsdefs.mk
-include $(MCOM_ROOT)/ldapserver/nsconfig.mk
+include $(BUILD_ROOT)/nsdefs.mk
+include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 ifeq ($(ARCH), OSF1)