diff options
| -rw-r--r-- | NWGNUmakefile | 24 | ||||
| -rw-r--r-- | build/NWGNUscripts.inc | 59 | ||||
| -rw-r--r-- | build/make_nw_export.awk | 2 | ||||
| -rw-r--r-- | modules/dav/fs/NWGNUmakefile | 3 | ||||
| -rw-r--r-- | modules/dav/lock/NWGNUmakefile | 3 | ||||
| -rw-r--r-- | modules/dav/main/NWGNUmakefile | 2 | ||||
| -rw-r--r-- | modules/proxy/NWGNUproxy | 26 | ||||
| -rw-r--r-- | support/NWGNUmakefile | 2 |
8 files changed, 61 insertions, 60 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index 4fa1afdf45..b30ada8d7e 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -405,19 +405,19 @@ install :: nlms instscripts FORCE $(call COPY,docs/conf/mime.types, $(INSTALL)/$(BASEDIR)/conf/) $(call COPY,docs/conf/charset.conv, $(INSTALL)/$(BASEDIR)/conf/) $(call COPY,docs/cgi-examples/printenv, $(INSTALL)/$(BASEDIR)/cgi-bin/printenv.pl) - -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build\mkconfnw.awk docs/conf/httpd.conf.in >$(INSTALL)/$(BASEDIR)/conf\httpd.conf + -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk docs/conf/httpd.conf.in >$(INSTALL)/$(BASEDIR)/conf\httpd.conf $(call MKDIR,$(INSTALL)/$(BASEDIR)/conf/extra) - -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-autoindex.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-autoindex.conf - -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-dav.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-dav.conf - -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-default.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-default.conf - -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-info.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-info.conf - -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-languages.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-languages.conf - -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-manual.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-manual.conf - -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-mpm.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-mpm.conf - -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-multilang-errordoc.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-multilang-errordoc.conf - -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-userdir.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-userdir.conf - -$(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 + -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-autoindex.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-autoindex.conf + -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-dav.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-dav.conf + -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-default.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-default.conf + -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-info.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-info.conf + -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-languages.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-languages.conf + -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-manual.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-manual.conf + -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-mpm.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-mpm.conf + -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-multilang-errordoc.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-multilang-errordoc.conf + -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-userdir.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-userdir.conf + -$(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)/) 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)>> $@
diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk index 4dbc4ca202..628ea60ff1 100644 --- a/build/make_nw_export.awk +++ b/build/make_nw_export.awk @@ -76,7 +76,7 @@ BEGIN { next } -/^[ \t]*(extern[ \t]+)?AP[RU]?_DECLARE_DATA .*;$/ { +/^[ \t]*(extern[ \t]+)?AP[RU]?_DECLARE_DATA .*;/ { gsub(/[*;]/, "", $NF) gsub(/\[.*\]/, "", $NF) add_symbol($NF) diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile index 5554cbf553..dcbb12d0ef 100644 --- a/modules/dav/fs/NWGNUmakefile +++ b/modules/dav/fs/NWGNUmakefile @@ -252,7 +252,8 @@ nlms :: libs $(TARGET_nlm) # correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\moddavfs.nlm $(INSTALL)\$(BASEDIR)\modules + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/) + # # Any specialized rules here # diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile index 269721e85f..f790e7f173 100644 --- a/modules/dav/lock/NWGNUmakefile +++ b/modules/dav/lock/NWGNUmakefile @@ -243,7 +243,8 @@ nlms :: libs $(TARGET_nlm) # correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\moddavlk.nlm $(INSTALL)\$(BASEDIR)\modules + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/) + # # Any specialized rules here # diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile index 5f25e953c0..bb52da9755 100644 --- a/modules/dav/main/NWGNUmakefile +++ b/modules/dav/main/NWGNUmakefile @@ -252,7 +252,7 @@ nlms :: libs $(TARGET_nlm) # correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\mod_dav.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/) # # Any specialized rules here diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy index d13d93fada..538001b11e 100644 --- a/modules/proxy/NWGNUproxy +++ b/modules/proxy/NWGNUproxy @@ -252,19 +252,19 @@ install :: nlms FORCE vpath %.c ../arch/netware $(OBJDIR)/mod_proxy.imp: - @echo Creating $@ - @echo # Exports of mod_proxy > $@ - @echo (AP$(VERSION_MAJMIN)) >> $@ - @echo proxy_module, >> $@ - @echo proxy_hook_canon_handler, >> $@ - @echo proxy_hook_post_request, >> $@ - @echo proxy_hook_pre_request, >> $@ - @echo proxy_hook_scheme_handler, >> $@ - @echo proxy_run_fixups, >> $@ - @echo ap_proxy_conn_is_https, >> $@ - @echo ap_proxy_ssl_enable, >> $@ - @echo ap_proxy_ssl_disable, >> $@ - @echo ap_proxy_ssl_val >> $@ + @echo $(DL)GEN $@$(DL) + @echo $(DL)# Exports of mod_proxy$(DL)> $@ + @echo $(DL) (AP$(VERSION_MAJMIN))$(DL)>> $@ + @echo $(DL) proxy_module,$(DL)>> $@ + @echo $(DL) proxy_hook_canon_handler,$(DL)>> $@ + @echo $(DL) proxy_hook_post_request,$(DL)>> $@ + @echo $(DL) proxy_hook_pre_request,$(DL)>> $@ + @echo $(DL) proxy_hook_scheme_handler,$(DL)>> $@ + @echo $(DL) proxy_run_fixups,$(DL)>> $@ + @echo $(DL) ap_proxy_conn_is_https,$(DL)>> $@ + @echo $(DL) ap_proxy_ssl_enable,$(DL)>> $@ + @echo $(DL) ap_proxy_ssl_disable,$(DL)>> $@ + @echo $(DL) ap_proxy_ssl_val$(DL)>> $@ # # Include the 'tail' makefile that has targets that depend on variables defined diff --git a/support/NWGNUmakefile b/support/NWGNUmakefile index 91020579b1..dce466fd0a 100644 --- a/support/NWGNUmakefile +++ b/support/NWGNUmakefile @@ -35,7 +35,7 @@ nlms :: libs $(TARGET_nlm) # correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\bin\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/bin/) # # Any specialized rules here |