From 0b00cd4edc87f82fddde3a089d16f2e416305209 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Fri, 28 Jan 2005 21:57:05 +0000
Subject: 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

---
 ldap/include/Makefile        | 6 +++---
 ldap/include/Makefile.client | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'ldap/include')

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
-- 
cgit