Commit 41fedb5f authored by Guenter Knauf's avatar Guenter Knauf
Browse files

NetWare build overhaul in order to compile on Linux. 

Some more fixes ...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079902 13f79535-47bb-0310-9956-ffa450edef68
parent c7f0f3fc

build/NWGNUenvironment.inc

+1 −1
Changes for build/NWGNUenvironment.inc: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ endif 
# endif



ifndef METROWERKS

METROWERKS = C:\Program Files\Metrowerks\CodeWarrior

METROWERKS = $(ProgramFiles)\Metrowerks\CodeWarrior

endif



# If LM_LICENSE_FILE isn't defined, define a variable that can be used to

build/NWGNUtail.inc

+1 −1
Changes for build/NWGNUtail.inc: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS) 
	@echo $(DL)-zerobss$(DL)>> $@

	@echo $(DL)-o $(TARGET_nlm)$(DL)>> $@

ifneq "$(FILE_nlm_copyright)" ""

	@-type $(FILE_nlm_copyright)$(DL)>> $@

	@$(CAT) $(FILE_nlm_copyright)>> $@

endif

ifeq "$(RELEASE)" "debug"

	@echo $(DL)-g$(DL)>> $@

modules/NWGNUmakefile

+1 −1
Changes for modules/NWGNUmakefile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ SUBDIRS += test \ 
endif



#If the mod_edir directory exists then build the mod_edir module

ifeq "$(wildcard $(AP_WORK)/modules/mod_edir)" "$(AP_WORK)/modules/mod_edir"

ifeq "$(wildcard $(STDMOD)/mod_edir)" "$(STDMOD)/mod_edir"

SUBDIRS += mod_edir \

	$(EOLIST)

endif

modules/ssl/NWGNUmakefile

+3 −3
Changes for modules/ssl/NWGNUmakefile: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -309,9 +309,9 @@ nlms :: libs $(TARGET_nlm) 
# correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)

#

install :: nlms FORCE

	copy $(OBJDIR)\mod_ssl.nlm $(INSTALL)\$(BASEDIR)\modules\*.*

	-copy $(subst /,\,$(SSL_BIN))\openssl.nlm $(INSTALL)\$(BASEDIR)\bin\*.*

	-copy $(subst /,\,$(SSL_APP))\openssl.cnf $(INSTALL)\$(BASEDIR)\bin\*.*

	$(call COPY,$(OBJDIR)/*.nlm,        $(INSTALL)/$(BASEDIR)/modules/)

	$(call COPY,$(SSL_BIN)/openssl.nlm, $(INSTALL)/$(BASEDIR)/bin/)

	$(call COPY,$(SSL_APP)/openssl.cnf, $(INSTALL)/$(BASEDIR)/bin/)



#

# Any specialized rules here