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

3 files changed, 15 insertions, 15 deletions

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