From bdaaee56d2857daae0c2baefa12b85768af074fc Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Mon, 15 Mar 2004 21:38:07 +0000 Subject: [PATCH] Backport source-build change for Win32 to accomodate the elimiation of ssl-std.conf. (rev 1.136 - 1.138) Substitute all fields correctly from ssl-std.conf.in, and then only if openssl is detected. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@102972 13f79535-47bb-0310-9956-ffa450edef68 --- Makefile.win | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.win b/Makefile.win index 8574a7a8820..bc5b475a9d8 100644 --- a/Makefile.win +++ b/Makefile.win @@ -630,8 +630,9 @@ BEGIN { << if not exist "$(INSTDIR)\conf\httpd.conf" \ 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 < "$(INSTDIR)\conf\ssl.default.conf" + -awk -f < "$(INSTDIR)\conf\ssl.default.conf" BEGIN { serverroot = ARGV[2]; delete ARGV[2]; @@ -641,11 +642,17 @@ 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; } << if not exist "$(INSTDIR)\conf\ssl.conf" \ copy "$(INSTDIR)\conf\ssl.default.conf" "$(INSTDIR)\conf\ssl.conf" +!ENDIF -awk -f <"$(INSTDIR)\bin\dbmmanage.pl" { if ( $$0 ~ /^BEGIN \{ @AnyDBM_File::/ ) { sub( /ISA = qw\(.*\)/, "ISA = qw(SDBM_File)" ); -- 2.47.2