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 /httpd/src/Makefile | |
| 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 'httpd/src/Makefile')
| -rw-r--r-- | httpd/src/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/httpd/src/Makefile b/httpd/src/Makefile index 26ac574c..bdcd81b1 100644 --- a/httpd/src/Makefile +++ b/httpd/src/Makefile @@ -7,20 +7,20 @@ # # Makefile.cpp for the Netsite Commerce and Communications servers. -MCOM_ROOT = ../../.. +BUILD_ROOT = ../.. MODULE=httpdBinary ifneq ($(ARCH), WINNT) -OLD_MCOM_ROOT := $(MCOM_ROOT) -MCOM_ROOT := $(shell cd $(OLD_MCOM_ROOT); pwd) +OLD_BUILD_ROOT := $(BUILD_ROOT) +BUILD_ROOT := $(shell cd $(OLD_BUILD_ROOT); pwd) BUILDSO=mocha admin endif HTTPD_DIR=$(OBJDIR) OBJDEST=$(HTTPD_DIR)/obj -include ../../nsconfig.mk +include $(BUILD_ROOT)/nsconfig.mk MCC_INCLUDE += $(ADMINUTIL_INCLUDE) @@ -203,7 +203,7 @@ endif # Netscape Directory Server else # WINNT $(MOCHA): - cd $(MCOM_ROOT)/mocha; $(MAKE) export $(NSDEFS) + cd $(BUILD_ROOT)/mocha; $(MAKE) export $(NSDEFS) $(DLLS): $(OBJS) $(DEPLIBS) $(OBJDEST)/ns-httpd.res -@echo EXTRA_LIBS = $(EXTRA_LIBS) |