Update the NetWare make install target to comply with the new .conf file layout

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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 808cbeed63e8bf23b8d0c66da3ec74e4fb4dba5e..ca7c3676e9be6f055f90db0f8531daaf5ef97428 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -319,7 +319,19 @@ install :: nlms FORCE
        -copy CHANGES                   $(INSTALL)\Apache2\*.*
        -copy support\dbmmanage.in      $(INSTALL)\Apache2\bin\dbmmanage.pl
        -copy support\logresolve.pl.in  $(INSTALL)\Apache2\bin\logresolve.pl
-       -awk  -f build\mkconfnw.awk docs\conf\httpd-std.conf.in >$(INSTALL)\Apache2\conf\httpd.conf
+       -awk  -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\Apache2\conf\httpd.conf
+       $(CHKNOT) $(INSTALL)\Apache2\conf\extra\nul mkdir $(INSTALL)\Apache2\conf\extra
+       -awk  -f build\mkconfnw.awk docs\conf\extra\httpd-autoindex.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-autoindex.conf
+       -awk  -f build\mkconfnw.awk docs\conf\extra\httpd-dav.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-dav.conf
+       -awk  -f build\mkconfnw.awk docs\conf\extra\httpd-default.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-default.conf
+       -awk  -f build\mkconfnw.awk docs\conf\extra\httpd-info.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-info.conf
+       -awk  -f build\mkconfnw.awk docs\conf\extra\httpd-languages.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-languages.conf
+       -awk  -f build\mkconfnw.awk docs\conf\extra\httpd-manual.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-manual.conf
+       -awk  -f build\mkconfnw.awk docs\conf\extra\httpd-mpm.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-mpm.conf
+       -awk  -f build\mkconfnw.awk docs\conf\extra\httpd-multilang-errordoc.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-multilang-errordoc.conf
+       -awk  -v SSL=1 -f build\mkconfnw.awk <nul >$(INSTALL)\Apache2\conf\extra\httpd-ssl.conf
+       -awk  -f build\mkconfnw.awk docs\conf\extra\httpd-userdir.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-userdir.conf
+       -awk  -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\Apache2\conf\extra\httpd-vhosts.conf
        -copy docs\conf\magic           $(INSTALL)\Apache2\conf\magic
        -copy docs\conf\mime.types      $(INSTALL)\Apache2\conf\mime.types
        -copy docs\conf\charset.conv    $(INSTALL)\Apache2\conf\charset.conv

diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index fe036545d3d11aec5aca5405dfa624888eacfbeb..b65c1682a53be8ac9661faaf10bd6a972566ecfa 100644 (file)
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -107,13 +107,15 @@ match ($0,/@nonssl_.*@/) {
 
 
 END {
-    print
-    print "#"
-    print "# SecureListen: Allows you to securely bind Apache to specific IP addresses "
-    print "# and/or ports."
-    print "#"
-    print "# Change this to SecureListen on specific IP addresses as shown below to "
-    print "# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)"
-    print "#"
-    print "#SecureListen 443 \"SSL CertificateDNS\""
+    if (SSL) {
+       print
+       print "#"
+       print "# SecureListen: Allows you to securely bind Apache to specific IP addresses "
+       print "# and/or ports."
+       print "#"
+       print "# Change this to SecureListen on specific IP addresses as shown below to "
+       print "# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)"
+       print "#"
+       print "#SecureListen 443 \"SSL CertificateDNS\""
+    }
 }