httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1079653 - in /httpd/httpd/trunk: NWGNUmakefile build/NWGNUhead.inc build/NWGNUscripts.inc
Date Wed, 09 Mar 2011 03:29:12 GMT
Author: fuankg
Date: Wed Mar  9 03:29:12 2011
New Revision: 1079653

URL: http://svn.apache.org/viewvc?rev=1079653&view=rev
Log:
NetWare build overhaul in order to compile on Linux.

Some more fixes ...

Modified:
    httpd/httpd/trunk/NWGNUmakefile
    httpd/httpd/trunk/build/NWGNUhead.inc
    httpd/httpd/trunk/build/NWGNUscripts.inc

Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=1079653&r1=1079652&r2=1079653&view=diff
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Wed Mar  9 03:29:12 2011
@@ -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/)

Modified: httpd/httpd/trunk/build/NWGNUhead.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUhead.inc?rev=1079653&r1=1079652&r2=1079653&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUhead.inc (original)
+++ httpd/httpd/trunk/build/NWGNUhead.inc Wed Mar  9 03:29:12 2011
@@ -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)

Modified: httpd/httpd/trunk/build/NWGNUscripts.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUscripts.inc?rev=1079653&r1=1079652&r2=1079653&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUscripts.inc (original)
+++ httpd/httpd/trunk/build/NWGNUscripts.inc Wed Mar  9 03:29:12 2011
@@ -4,7 +4,7 @@ instscripts:: FORCE $(INSTALL)/$(BASEDIR
 
 $(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)>> $@



Mime
View raw message