diff options
Diffstat (limited to 'httpd/src')
| -rw-r--r-- | httpd/src/Makefile | 10 | ||||
| -rw-r--r-- | httpd/src/unixso.mk | 7 |
2 files changed, 7 insertions, 10 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) diff --git a/httpd/src/unixso.mk b/httpd/src/unixso.mk index e60e0226..8d47ffbf 100644 --- a/httpd/src/unixso.mk +++ b/httpd/src/unixso.mk @@ -5,11 +5,10 @@ # All rights reserved. # END COPYRIGHT BLOCK # -LIBSECDIR=$(MCOM_ROOT)/lib/libsec/$(NSOBJDIR_NAME) ifneq ($(ARCH), WINNT) -SRCDIR=$(MCOM_ROOT)/ldapserver/httpd/src +SRCDIR=$(BUILD_ROOT)/httpd/src AR = ar @@ -67,13 +66,11 @@ endif ifeq ($(ARCH), AIX) MKSHLIB_FLAGS += -berok -brtl SOLINK=-L. -L../../lib -lns-dshttpd$(DLL_PRESUF) -LIBSECDIR=$(MCOM_ROOT)/lib/libsec/$(NSOBJDIR_NAME) #LDAPLINK=-L. $(addsuffix .a, $(addprefix lib, $(LDAP_DOTALIB_NAMES))) \ # $(addprefix -l, $(LDAP_SOLIB_NAMES)) #NSPRLINK = -L. -lnspr$(DLL_PRESUF) #NSPRLINK = -L. -ldsnspr$(DLL_PRESUF) ADM_EXTRA := -L. -L../../lib $(LDAPLINK) $(NSPRLINK) $(EXTRA_LIBS) -#ADM_EXTRA := -L. -L../../lib $(LDAPLINK) $(NSPRLINK) $(EXTRA_LIBS) -L$(LIBSECDIR) -lsec-$(WHICHA) ifdef FORTEZZA ADM_EXTRA += $(NSCP_DISTDIR)/lib/libci.$(LIB_SUFFIX) endif @@ -189,7 +186,7 @@ MOCHA=$(NSCP_DISTDIR)/lib/mocha.a ADMLIB_LIBS = $(SERVLIBS) $(NSLIBS) mocha: - cd $(MCOM_ROOT)/mocha; $(MAKE) export $(NSDEFS) + cd $(BUILD_ROOT)/mocha; $(MAKE) export $(NSDEFS) admobjs: |