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

6 files changed, 21 insertions, 21 deletions

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