Bugfix 2 - fix the rest of the subst codes for ssl.conf on Win32.

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

diff --git a/Makefile.win b/Makefile.win
index aed5c2d1f6bee7d6f643a98ba281fbd80609a0ef..cbcddad57e914dba7d34d4d4f73e0f81f6087434 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -646,7 +646,7 @@ BEGIN {
            copy "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)\conf\httpd.conf"
 !IF EXIST("srclib\openssl")
        copy docs\conf\ssl-std.conf.in "$(INSTDIR)\conf\ssl.default.conf" <.y
-       -awk -f <<script.awk "docs/conf/ssl-std.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\ssl.default.conf"
+       -awk -f <<script.awk "docs/conf/ssl-std.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\ssl.default.conf"
     BEGIN { 
        serverroot = ARGV[2];
        delete ARGV[2];
@@ -656,6 +656,11 @@ BEGIN {
     }
     {
        gsub( /@@ServerRoot@@/, serverroot );
+       gsub( /@exp_runtimedir@/, "logs" );
+       gsub( /@exp_htdocsdir@/, serverroot "/htdocs" );
+       gsub( /@exp_logfiledir@/, "logs" );
+       gsub( /@exp_sysconfdir@/, "conf" );
+       gsub( /@exp_cgidir@/, serverroot "/cgi" );
        print $$0;
     }
 <<