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

7 files changed, 28 insertions, 29 deletions

diff --git a/lib/base/Makefile b/lib/base/Makefile
index f58195d3..d646be03 100644
--- a/lib/base/Makefile
+++ b/lib/base/Makefile
@@ -10,10 +10,10 @@
 # provided here.
 
 
-MCOM_ROOT=../../..
+BUILD_ROOT=../..
 MODULE=LibBase
 
-include ../../nsdefs.mk
+include $(BUILD_ROOT)/nsdefs.mk
 
 OBJDEST=$(OBJDIR)/lib/base
 
@@ -26,7 +26,7 @@ else
 LIBS=$(OBJDIR)/lib/libbase.a
 endif
 
-include ../../nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 
 MCC_INCLUDE += $(ADMINUTIL_INCLUDE)
 
@@ -84,11 +84,11 @@ OBJS = $(addprefix $(OBJDEST)/,	\
 				$(OSOBJS) \
 				) 
 
-MODULE_CFLAGS=-I$(NSROOT)/include/base
+MODULE_CFLAGS=-I$(BUILD_ROOT)/include/base
 
 ifeq ($(PRODUCT),"Netscape Catalog Server")
 ifeq ($(ARCH), WINNT)
-MCC_INCLUDE := $(subst -I$(MCOM_ROOT)/lib/libnet,,$(MCC_INCLUDE))
+MCC_INCLUDE := $(subst -I$(BUILD_ROOT)/lib/libnet,,$(MCC_INCLUDE))
 endif
 endif
 
diff --git a/lib/ldaputil/Makefile b/lib/ldaputil/Makefile
index c6c95400..131a9905 100644
--- a/lib/ldaputil/Makefile
+++ b/lib/ldaputil/Makefile
@@ -8,12 +8,12 @@
 #
 # Makefile for libldapu.a (ldaputil library)
 #
-MCOM_ROOT=../../..
+BUILD_ROOT=../..
 MODULE=LibLdapUtil
 
 OBJDEST=$(OBJDIR)/lib/ldaputil
 
-include ../../nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 
 ifeq ($(ARCH), WINNT)
 LIBS=$(OBJDIR)/lib/libldapu.lib
@@ -24,8 +24,7 @@ endif
 
 LOCAL_DEPS = $(LDAPSDK_DEP)
 
-MCC_INCLUDE=-I$(NSROOT)/include \
-            -I$(MCOM_ROOT)/include \
+MCC_INCLUDE=-I$(BUILD_ROOT)/include \
 			 $(DBM_INCLUDE) $(LDAPSDK_INCLUDE) \
 			 $(SECURITY_INCLUDE) $(NSPR_INCLUDE) 
 
diff --git a/lib/ldaputil/utest/Makefile b/lib/ldaputil/utest/Makefile
index e6f2e5c6..bb545d9b 100644
--- a/lib/ldaputil/utest/Makefile
+++ b/lib/ldaputil/utest/Makefile
@@ -8,16 +8,16 @@
 #
 # Makefile for ldaputil unit test.
 #
-MCOM_ROOT=../../../..
+BUILD_ROOT=../../..
 MODULE=LibLdapUtil
 
 OBJDEST=.
 UTESTDEST=utest
 
-include ../../../nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 
 MODULE_CFLAGS=-I$(NSROOT)/include
- 
+
 include $(INCLUDE_DEPENDS)
 
 TESTFLAGS = -DUTEST -DDBG_PRINT -DDONT_USE_LDAP_SSL
@@ -95,7 +95,7 @@ PLUGIN_INC = ./include
 $(PLUGIN_INC):
 	mkdir -p include
 
-certmap.h: ../../../include/ldaputil/extcmap.h
+certmap.h: $(BUILD_ROOT)/include/ldaputil/extcmap.h
 	\rm -rf $(PLUGIN_INC)/$@
 	cp $^ $(PLUGIN_INC)/$@
 
diff --git a/lib/libaccess/Makefile b/lib/libaccess/Makefile
index 1ed3b58a..2acb484b 100644
--- a/lib/libaccess/Makefile
+++ b/lib/libaccess/Makefile
@@ -8,15 +8,15 @@
 #
 # Makefile for libaccess.a
 #
-MCOM_ROOT=../../..
+BUILD_ROOT=../..
 MODULE=LibAccess
-include ../../nsdefs.mk
+include $(BUILD_ROOT)/nsdefs.mk
 
 OBJDEST=$(OBJDIR)/lib/libaccess
 UTESTDEST=$(OBJDIR)/lib/libaccess/utest
 LEX=flex
 
-include ../../nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 
 MCC_INCLUDE += $(ADMINUTIL_INCLUDE)
 
@@ -87,7 +87,7 @@ OBJS=$(addprefix $(OBJDEST)/,	usi.o \
 #
 AVAMAPFILES = lex.yy.o y.tab.o avapfile.o avadb.o 
 
-MODULE_CFLAGS=-I$(NSROOT)/include -DACL_LIB_INTERNAL $(TESTFLAGS)
+MODULE_CFLAGS=-I$(BUILD_ROOT)/include -DACL_LIB_INTERNAL $(TESTFLAGS)
 
 ifeq ($(LDAP_NO_LIBLCACHE),1)
 MODULE_CFLAGS+=-DNO_LIBLCACHE
diff --git a/lib/libaccess/utest/Makefile b/lib/libaccess/utest/Makefile
index 2acedff0..a7006ee5 100644
--- a/lib/libaccess/utest/Makefile
+++ b/lib/libaccess/utest/Makefile
@@ -7,16 +7,16 @@
 #
 #
 #
-MCOM_ROOT=../../../..
+BUILD_ROOT=../../..
 MODULE=LibAcl
-include ../../../nsdefs.mk
+include $(BUILD_ROOT)/nsdefs.mk
 
 OBJDEST=.
 UTESTDEST=utest
 
-include ../../../nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 
-MODULE_CFLAGS=-I$(NSROOT)/include/libaccess -I$(NSROOT)/include -I$(NSROOT)/include/public -I. -DACL_LIB_INTERNAL
+MODULE_CFLAGS=-I$(BUILD_ROOT)/include/libaccess -I$(BUILD_ROOT)/include -I$(BUILD_ROOT)/include/public -I. -DACL_LIB_INTERNAL
 
 include $(INCLUDE_DEPENDS)
 
diff --git a/lib/libadmin/Makefile b/lib/libadmin/Makefile
index 68029ce2..a1904250 100644
--- a/lib/libadmin/Makefile
+++ b/lib/libadmin/Makefile
@@ -7,12 +7,12 @@
 #
 # The admin libraries
 
-MCOM_ROOT=../../..
+BUILD_ROOT=../..
 
 MODULE=LibAdmin
 MODULE_CFLAGS=-DENCRYPT_PASSWORDS -DUSE_ADMSERV
 
-include ../../nsdefs.mk
+include $(BUILD_ROOT)/nsdefs.mk
 
 OBJDEST=$(OBJDIR)/lib/libadmin
 
@@ -39,10 +39,10 @@ OBJS=$(addprefix $(OBJDEST)/, admconf.o form_get.o error.o  admlog.o \
 
 all: $(OBJDEST) $(LIBS)
 
-$(LIBS): $(addprefix $(MCOM_ROOT)/ldapserver/include/libadmin/, \
+$(LIBS): $(addprefix $(BUILD_ROOT)/include/libadmin/, \
                      hadm_msgs.i la_msgs.i)
 
-include ../../nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 
 MCC_INCLUDE += $(ADMINUTIL_INCLUDE)
 
diff --git a/lib/libsi18n/Makefile b/lib/libsi18n/Makefile
index 9b1c9c2e..d9926bd5 100644
--- a/lib/libsi18n/Makefile
+++ b/lib/libsi18n/Makefile
@@ -8,15 +8,15 @@
 # The libsi18n library support for getting strings from the
 # string database.
 
-MCOM_ROOT=../../..
+BUILD_ROOT=../..
 MODULE=LibsI18N
-include ../../nsdefs.mk
+include $(BUILD_ROOT)/nsdefs.mk
 
 NSDEFS_PRODUCT = $(NS_PRODUCT)
 
 OBJDEST=$(OBJDIR)/lib/libsi18n
 
-L10NDIR = $(MCOM_ROOT)/ldapserver/l10n
+L10NDIR = $(BUILD_ROOT)/l10n
 
 ifeq ($(ARCH), WINNT)
 CCOUT0=  /Fo
@@ -119,7 +119,7 @@ DBTheaders = \
         gsadmserv.h
 endif
 
-include ../../nsconfig.mk
+include $(BUILD_ROOT)/nsconfig.mk
 
 MCC_INCLUDE += $(ADMINUTIL_INCLUDE)