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 /lib/libaccess | |
| 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 'lib/libaccess')
| -rw-r--r-- | lib/libaccess/Makefile | 8 | ||||
| -rw-r--r-- | lib/libaccess/utest/Makefile | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/libaccess/Makefile b/lib/libaccess/Makefile index 1ed3b58a..2acb484b 100644 --- a/lib/libaccess/Makefile +++ b/lib/libaccess/Makefile @@ -8,15 +8,15 @@ # # Makefile for libaccess.a # -MCOM_ROOT=../../.. +BUILD_ROOT=../.. MODULE=LibAccess -include ../../nsdefs.mk +include $(BUILD_ROOT)/nsdefs.mk OBJDEST=$(OBJDIR)/lib/libaccess UTESTDEST=$(OBJDIR)/lib/libaccess/utest LEX=flex -include ../../nsconfig.mk +include $(BUILD_ROOT)/nsconfig.mk MCC_INCLUDE += $(ADMINUTIL_INCLUDE) @@ -87,7 +87,7 @@ OBJS=$(addprefix $(OBJDEST)/, usi.o \ # AVAMAPFILES = lex.yy.o y.tab.o avapfile.o avadb.o -MODULE_CFLAGS=-I$(NSROOT)/include -DACL_LIB_INTERNAL $(TESTFLAGS) +MODULE_CFLAGS=-I$(BUILD_ROOT)/include -DACL_LIB_INTERNAL $(TESTFLAGS) ifeq ($(LDAP_NO_LIBLCACHE),1) MODULE_CFLAGS+=-DNO_LIBLCACHE diff --git a/lib/libaccess/utest/Makefile b/lib/libaccess/utest/Makefile index 2acedff0..a7006ee5 100644 --- a/lib/libaccess/utest/Makefile +++ b/lib/libaccess/utest/Makefile @@ -7,16 +7,16 @@ # # # -MCOM_ROOT=../../../.. +BUILD_ROOT=../../.. MODULE=LibAcl -include ../../../nsdefs.mk +include $(BUILD_ROOT)/nsdefs.mk OBJDEST=. UTESTDEST=utest -include ../../../nsconfig.mk +include $(BUILD_ROOT)/nsconfig.mk -MODULE_CFLAGS=-I$(NSROOT)/include/libaccess -I$(NSROOT)/include -I$(NSROOT)/include/public -I. -DACL_LIB_INTERNAL +MODULE_CFLAGS=-I$(BUILD_ROOT)/include/libaccess -I$(BUILD_ROOT)/include -I$(BUILD_ROOT)/include/public -I. -DACL_LIB_INTERNAL include $(INCLUDE_DEPENDS) |