diff options
author | Rich Megginson <rmeggins@redhat.com> | 2005-01-28 21:57:05 +0000 |
---|---|---|
committer | Rich Megginson <rmeggins@redhat.com> | 2005-01-28 21:57:05 +0000 |
commit | 0b00cd4edc87f82fddde3a089d16f2e416305209 (patch) | |
tree | f47e944cfa83dcd946fad259f2f37e1499785ac3 /ldap/include | |
parent | b323e287076458e646831a3b5cec0262ac60c5fd (diff) | |
download | ds-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/include')
-rw-r--r-- | ldap/include/Makefile | 6 | ||||
-rw-r--r-- | ldap/include/Makefile.client | 4 |
2 files changed, 5 insertions, 5 deletions
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 |