Use define for serverroot with Windows conf files.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832962 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index a786c7fc05d4d90b379be6231339528e278f1874..6d320ebf646342ef7351f2ac859ca21699a84164 100644 (file)
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -205,15 +205,19 @@ BEGIN {
           print "#LoadModule xml2enc_module modules/mod_xml2enc.so" > dstfl;
           continue;
         }
-        gsub( /@@ServerRoot@@/,   serverroot );
-        gsub( /@exp_cgidir@/,     serverroot "/cgi-bin" );
-        gsub( /@exp_sysconfdir@/, serverroot "/conf" );
-        gsub( /@exp_errordir@/,   serverroot "/error" );
-        gsub( /@exp_htdocsdir@/,  serverroot "/htdocs" );
-        gsub( /@exp_iconsdir@/,   serverroot "/icons" );
-        gsub( /@exp_manualdir@/,  serverroot "/manual" );
-        gsub( /@exp_runtimedir@/, serverroot "/logs" );
-        if ( gsub( /@exp_logfiledir@/, serverroot "/logs" ) ||
+        if ( /^ServerRoot / ) {
+          print "Define SRVROOT \"" serverroot "\"" > dstfl;
+          print "" > dstfl;
+        }
+        gsub( /@@ServerRoot@@/,   "\${SRVROOT}" );
+        gsub( /@exp_cgidir@/,     "\${SRVROOT}" "/cgi-bin" );
+        gsub( /@exp_sysconfdir@/, "\${SRVROOT}" "/conf" );
+        gsub( /@exp_errordir@/,   "\${SRVROOT}" "/error" );
+        gsub( /@exp_htdocsdir@/,  "\${SRVROOT}" "/htdocs" );
+        gsub( /@exp_iconsdir@/,   "\${SRVROOT}" "/icons" );
+        gsub( /@exp_manualdir@/,  "\${SRVROOT}" "/manual" );
+        gsub( /@exp_runtimedir@/, "\${SRVROOT}" "/logs" );
+        if ( gsub( /@exp_logfiledir@/, "\${SRVROOT}" "/logs" ) ||
              gsub( /@rel_logfiledir@/, "logs" ) ) {
           gsub( /_log"/, ".log\"" )
         }