httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1451830 - /httpd/httpd/trunk/build/installwinconf.awk
Date Sat, 02 Mar 2013 03:43:39 GMT
Author: fuankg
Date: Sat Mar  2 03:43:39 2013
New Revision: 1451830

URL: http://svn.apache.org/r1451830
Log:
Use define for serverroot with Windows conf files.

Modified:
    httpd/httpd/trunk/build/installwinconf.awk

Modified: httpd/httpd/trunk/build/installwinconf.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/installwinconf.awk?rev=1451830&r1=1451829&r2=1451830&view=diff
==============================================================================
--- httpd/httpd/trunk/build/installwinconf.awk (original)
+++ httpd/httpd/trunk/build/installwinconf.awk Sat Mar  2 03:43:39 2013
@@ -199,15 +199,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\"" )
         }



Mime
View raw message