diff options
| -rw-r--r-- | NWGNUmakefile | 26 | ||||
| -rw-r--r-- | build/NWGNUenvironment.inc | 3 | ||||
| -rw-r--r-- | build/NWGNUmakefile | 2 | ||||
| -rw-r--r-- | build/NWGNUtail.inc | 2 |
4 files changed, 18 insertions, 15 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index f340c66540..4cdcb88b20 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -338,22 +338,22 @@ install :: nlms FORCE -copy support\dbmmanage.in $(INSTALL)\$(BASEDIR)\bin\dbmmanage.pl -copy support\logresolve.pl.in $(INSTALL)\$(BASEDIR)\bin\logresolve.pl ifdef USE_STDSOCKETS - -awk -v BDIR=$(BASEDIR) -v MODSSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf + -$(AWK) -v BDIR=$(BASEDIR) -v MODSSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf else - -awk -v BDIR=$(BASEDIR) -v NWSSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf + -$(AWK) -v BDIR=$(BASEDIR) -v NWSSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf endif $(CHKNOT) $(INSTALL)\$(BASEDIR)\conf\extra\nul 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-ssl.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-ssl.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) -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-vhosts.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-ssl.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-ssl.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) -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-vhosts.conf -copy docs\conf\magic $(INSTALL)\$(BASEDIR)\conf\magic -copy docs\conf\mime.types $(INSTALL)\$(BASEDIR)\conf\mime.types -copy docs\conf\charset.conv $(INSTALL)\$(BASEDIR)\conf\charset.conv diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index b65ad9b96c..18398de449 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -116,6 +116,9 @@ CPP = mwccnlm LINK = mwldnlm LIB = mwldnlm -type library -w nocmdline +# Setup build tools +AWK = awk + ifdef IPV6 ifndef USE_STDSOCKETS USE_STDSOCKETS=1 diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index 7709b9c052..9f78bd600f 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -24,7 +24,7 @@ nlms :: $(NWOS)/httpd.imp $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i @echo Generating $(subst /,\,$@) - awk -f make_nw_export.awk nw_export.i | sort >$(NWOS)/httpd.imp + $(AWK) -f make_nw_export.awk nw_export.i | sort >$(NWOS)/httpd.imp nw_export.i : nw_export.inc $(FILES_prebuild_headers) cc.opt @echo Generating $(subst /,\,$@) diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc index e84babaa09..3169f9c826 100644 --- a/build/NWGNUtail.inc +++ b/build/NWGNUtail.inc @@ -84,7 +84,7 @@ endif $(AP_WORK)\build\NWGNUversion.inc : $(AP_WORK)\include\ap_release.h $(AP_WORK)\build\nw_ver.awk @echo Generating $(subst /,\,$@) - awk -f $(AP_WORK)\build\nw_ver.awk $(AP_WORK)\include\ap_release.h > $(AP_WORK)\build\NWGNUversion.inc + $(AWK) -f $(AP_WORK)\build\nw_ver.awk $(AP_WORK)\include\ap_release.h > $(AP_WORK)\build\NWGNUversion.inc -include $(AP_WORK)\build\NWGNUversion.inc |