Commit 2274d83c authored by Steffen Land's avatar Steffen Land
Browse files

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
parent b35b034c

build/installwinconf.awk

+13 −9
Original line number Diff line number Diff line
@@ -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\"" )

        }