NetWare build overhaul in order to compile on Linux.

Some more fixes ...


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

1 files changed, 29 insertions, 30 deletions

diff --git a/build/NWGNUscripts.inc b/build/NWGNUscripts.inc
index 01809624c3..ecd18c2086 100644
--- a/build/NWGNUscripts.inc
+++ b/build/NWGNUscripts.inc
@@ -3,42 +3,41 @@
 instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2auto.ncf $(INSTALL)/$(BASEDIR)/ap2rest.ncf $(INSTALL)/$(BASEDIR)/ap2stop.ncf

 

 $(INSTALL)/$(BASEDIR)/ap2start.ncf:

-	@echo # NCF to start Apache 2.x in own address space > $@

-	@echo # Make sure that httpstk isn't listening on 80 >> $@

-	@echo # httpcloseport 80 /silent >> $@

-	@echo # search add SYS:/$(BASEDIR) >> $@

-	@echo load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2 >> $@

-	@echo # If you have problems with 3rd-party modules try to load in OS space. >> $@

-	@echo # load SYS:/$(BASEDIR)/apache2 >> $@

-	@echo. >> $@

+	@echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@

+	@echo $(DL)# Make sure that httpstk isn't listening on 80$(DL)>> $@

+	@echo $(DL)# httpcloseport 80 /silent$(DL)>> $@

+	@echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@

+	@echo $(DL)load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@

+	@echo $(DL)# If you have problems with 3rd-party modules try to load in OS space.$(DL)>> $@

+	@echo $(DL)# load SYS:/$(BASEDIR)/apache2$(DL)>> $@

+	@$(ECHONL)>> $@

 

 $(INSTALL)/$(BASEDIR)/ap2auto.ncf:

-	@echo # NCF to start Apache 2.x in own address space > $@

-	@echo # and let automatically restart in case it crashes >> $@

-	@echo # Make sure that httpstk isn't listening on 80 >> $@

-	@echo # httpcloseport 80 /silent >> $@

-	@echo # search add SYS:/$(BASEDIR) >> $@

-	@echo restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2 >> $@

-	@echo. >> $@

+	@echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@

+	@echo $(DL)# and let automatically restart in case it crashes$(DL)>> $@

+	@echo $(DL)# Make sure that httpstk isn't listening on 80$(DL)>> $@

+	@echo $(DL)# httpcloseport 80 /silent$(DL)>> $@

+	@echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@

+	@echo $(DL)restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@

+	@$(ECHONL)>> $@

 

 $(INSTALL)/$(BASEDIR)/ap2rest.ncf:

-	@echo # NCF to restart Apache 2.x in own address space > $@

-	@echo apache2 restart -p $(BASEDIR) >> $@

-	@echo # If you have loaded Apache2.x in OS space use the line below. >> $@

-	@echo # apache2 restart >> $@

-	@echo. >> $@

+	@echo $(DL)# NCF to restart Apache 2.x in own address space$(DL)> $@

+	@echo $(DL)apache2 restart -p $(BASEDIR)$(DL)>> $@

+	@echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@

+	@echo $(DL)# apache2 restart$(DL)>> $@

+	@$(ECHONL)>> $@

 

 $(INSTALL)/$(BASEDIR)/ap2stop.ncf:

-	@echo # NCF to stop Apache 2.x in own address space > $@

-	@echo apache2 shutdown -p $(BASEDIR) >> $@

-	@echo # If you have loaded Apache2.x in OS space use the line below. >> $@

-	@echo # apache2 shutdown >> $@

-	@echo. >> $@

+	@echo $(DL)# NCF to stop Apache 2.x in own address space$(DL)> $@

+	@echo $(DL)apache2 shutdown -p $(BASEDIR)$(DL)>> $@

+	@echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@

+	@echo $(DL)# apache2 shutdown$(DL)>> $@

+	@$(ECHONL)>> $@

 

 $(INSTALL)/$(BASEDIR)/ap2prod.ncf:

-	@echo # NCF to create a product record for Apache 2.x in product database > $@

-	@echo PRODSYNC DEL APACHE$(VERSION_MAJMIN) >> $@

-	@echo PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver" >> $@

-	@echo. >> $@

-

+	@echo $(DL)# NCF to create a product record for Apache 2.x in product database$(DL)> $@

+	@echo $(DL)PRODSYNC DEL APACHE$(VERSION_MAJMIN)$(DL)>> $@

+	@echo $(DL)PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver"$(DL)>> $@

+	@$(ECHONL)>> $@