summaryrefslogtreecommitdiffstats
path: root/ldap/libraries/libutil/Makefile
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/libraries/libutil/Makefile
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/libraries/libutil/Makefile')
-rw-r--r--ldap/libraries/libutil/Makefile10
1 files changed, 5 insertions, 5 deletions
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