From: Guenter Knauf <fuankg@apache.org>
Date: Wed, 9 Mar 2011 03:29:12 +0000 (+0000)
Subject: NetWare build overhaul in order to compile on Linux.
X-Git-Tag: 2.3.12~265
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10ad24bb7e6b9bd86d8cde50061698f33365d2f0;p=apache

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 b30ada8d7e..344b35ae32 100644
--- 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 2ae65206ff..78a96db7c6 100644
--- 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 ecd18c2086..ecaa7f6ae5 100644
--- a/build/NWGNUscripts.inc
+++ b/build/NWGNUscripts.inc
@@ -4,7 +4,7 @@ instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2
 
 $(INSTALL)/$(BASEDIR)/ap2start.ncf:
 	@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)# Make sure that httpstk is not 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)>> $@
@@ -15,7 +15,7 @@ $(INSTALL)/$(BASEDIR)/ap2start.ncf:
 $(INSTALL)/$(BASEDIR)/ap2auto.ncf:
 	@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)# Make sure that httpstk is not 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)>> $@