From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 15 Mar 2004 21:20:15 +0000 (+0000)
Subject:   Bugfix 2 - fix the rest of the subst codes for ssl.conf on Win32.
X-Git-Tag: pre_ajp_proxy~526
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6abb6c9ff9a6fdfc5cb76821a71624641337871;p=apache

  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 aed5c2d1f6..cbcddad57e 100644
--- 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;
     }
 <<