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/servers/slapd/test-plugins | |
| 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/servers/slapd/test-plugins')
| -rw-r--r-- | ldap/servers/slapd/test-plugins/Makefile | 10 | ||||
| -rw-r--r-- | ldap/servers/slapd/test-plugins/Makefile.server | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ldap/servers/slapd/test-plugins/Makefile b/ldap/servers/slapd/test-plugins/Makefile index 8b78aada..08cdf854 100644 --- a/ldap/servers/slapd/test-plugins/Makefile +++ b/ldap/servers/slapd/test-plugins/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 @@ -20,11 +20,11 @@ OBJDEST = $(OBJDIR)/servers/obj BINDIR = $(OBJDIR)/bin LIBDIR = $(OBJDIR)/lib -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 -include $(MCOM_ROOT)/ldapserver/ns_usepurify.mk -include $(MCOM_ROOT)/ldapserver/ns_usedb.mk +include $(BUILD_ROOT)/ns_usepurify.mk +include $(BUILD_ROOT)/ns_usedb.mk EXTRA_INCLUDES=-I.. -I../../../include $(NSPR_INCLUDE) -I$(LDAP_INCLUDE) -I$(DB_INCLUDE) -I../../../servers/slapd -g diff --git a/ldap/servers/slapd/test-plugins/Makefile.server b/ldap/servers/slapd/test-plugins/Makefile.server index 4923aa38..09a4ac81 100644 --- a/ldap/servers/slapd/test-plugins/Makefile.server +++ b/ldap/servers/slapd/test-plugins/Makefile.server @@ -9,7 +9,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 @@ -18,9 +18,9 @@ NSPR20=true # probably should be defined somewhere else (not sure where) OBJDEST = $(OBJDIR)/lib/libtestplug LIBDIR = $(LIB_RELDIR) -include $(MCOM_ROOT)/ldapserver/nsconfig.mk +include $(BUILD_ROOT)/nsconfig.mk include $(LDAP_SRC)/nsldap.mk -include $(MCOM_ROOT)/ldapserver/ns_usedb.mk +include $(BUILD_ROOT)/ns_usedb.mk ifeq ($(ARCH), WINNT) DEF_FILE:=./libdistrib.def |