summaryrefslogtreecommitdiffstats
path: root/ldap/servers/plugins/collation
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2005-01-28 21:57:05 +0000
committerRich Megginson <rmeggins@redhat.com>2005-01-28 21:57:05 +0000
commit0b00cd4edc87f82fddde3a089d16f2e416305209 (patch)
treef47e944cfa83dcd946fad259f2f37e1499785ac3 /ldap/servers/plugins/collation
parentb323e287076458e646831a3b5cec0262ac60c5fd (diff)
downloadds-0b00cd4edc87f82fddde3a089d16f2e416305209.tar.gz
ds-0b00cd4edc87f82fddde3a089d16f2e416305209.tar.xz
ds-0b00cd4edc87f82fddde3a089d16f2e416305209.zip
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
Diffstat (limited to 'ldap/servers/plugins/collation')
-rw-r--r--ldap/servers/plugins/collation/Makefile6
1 files changed, 3 insertions, 3 deletions
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)