diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2004-03-15 22:20:15 +0100 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2004-03-15 22:20:15 +0100 |
| commit | e6abb6c9ff9a6fdfc5cb76821a71624641337871 (patch) | |
| tree | 8ea0cae78c7e04f9fcc2c7b0ec4e0e53e66fba1e /Makefile.win | |
| parent | update transformation (diff) | |
| download | apache2-e6abb6c9ff9a6fdfc5cb76821a71624641337871.tar.xz apache2-e6abb6c9ff9a6fdfc5cb76821a71624641337871.zip | |
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
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 7 |
1 files changed, 6 insertions, 1 deletions
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; } << |