NetWare build overhaul in order to compile on Linux.

Some more fixes ...

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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index b30ada8d7e1912780f47de6f13e9730d2981a162..344b35ae3265dda4926f5efce20710d3f0345315 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -419,10 +419,10 @@ install :: nlms instscripts FORCE
        -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -f build/mkconfNW.awk docs/conf/extra/httpd-vhosts.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-vhosts.conf
        -$(AWK) -v BDIR=$(BASEDIR) -v SSLPORT=$(SSLPORT) -f build/mkconfNW.awk docs/conf/extra/httpd-ssl.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-ssl.conf
        $(call COPYR,docs/docroot,               $(INSTALL)/$(BASEDIR)/htdocs)
-       $(call COPYR,docs/error,                 $(INSTALL)/$(BASEDIR)/)
-       $(call COPYR,docs/icons,                 $(INSTALL)/$(BASEDIR)/)
-       $(call COPYR,docs/man,                   $(INSTALL)/$(BASEDIR)/)
-       $(call COPYR,docs/manual,                $(INSTALL)/$(BASEDIR)/)
+       $(call COPYR,docs/error,                 $(INSTALL)/$(BASEDIR)/error)
+       $(call COPYR,docs/icons,                 $(INSTALL)/$(BASEDIR)/icons)
+       $(call COPYR,docs/man,                   $(INSTALL)/$(BASEDIR)/man)
+       $(call COPYR,docs/manual,                $(INSTALL)/$(BASEDIR)/manual)
 
 installdev :: FORCE
        $(call COPY,$(SRC)/include/*.h,          $(INSTALL)/$(BASEDIR)/include/)

diff --git a/build/NWGNUhead.inc b/build/NWGNUhead.inc
index 2ae65206fffa00c71258f23baee220a0d64c7e75..78a96db7c6a37e1c2ba3e5a75cdf99e2177168a7 100644 (file)
--- a/build/NWGNUhead.inc
+++ b/build/NWGNUhead.inc
@@ -49,7 +49,7 @@ $(INSTDEVDIRS) ::
 endif #NO_LICENSE_FILE check
 
 help :
-       @echo $(DL)targets for RELEASE=$(RELEASE):
+       @echo $(DL)targets for RELEASE=$(RELEASE):$(DL)
        @echo $(DL)(default) . . . . libs nlms$(DL)
        @echo $(DL)all . . . . . . . does everything (libs nlms install)$(DL)
        @echo $(DL)libs. . . . . . . builds all libs$(DL)

diff --git a/build/NWGNUscripts.inc b/build/NWGNUscripts.inc
index ecd18c2086131904f0d73c8ee192a850fd884ae0..ecaa7f6ae516750c2b4dfce3fa66f6129fc96b1a 100644 (file)
--- a/build/NWGNUscripts.inc
+++ b/build/NWGNUscripts.inc
@@ -4,7 +4,7 @@ instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2
 \r
 $(INSTALL)/$(BASEDIR)/ap2start.ncf:\r
        @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@\r
-       @echo $(DL)# Make sure that httpstk isn't listening on 80$(DL)>> $@\r
+       @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@\r
        @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@\r
        @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@\r
        @echo $(DL)load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@\r
@@ -15,7 +15,7 @@ $(INSTALL)/$(BASEDIR)/ap2start.ncf:
 $(INSTALL)/$(BASEDIR)/ap2auto.ncf:\r
        @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@\r
        @echo $(DL)# and let automatically restart in case it crashes$(DL)>> $@\r
-       @echo $(DL)# Make sure that httpstk isn't listening on 80$(DL)>> $@\r
+       @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@\r
        @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@\r
        @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@\r
        @echo $(DL)restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@\r