diff options
| author | Guenter Knauf <fuankg@apache.org> | 2013-03-02 03:43:39 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2013-03-02 03:43:39 +0000 |
| commit | 1b9fc3e72dc5226c5a79f82c69c24b36953625af (patch) | |
| tree | 4440d98c99772185a534f51e3b52935e3b2179a8 /build | |
| parent | d74807162d50dd8b2ad849eac0fcbaad3c9de649 (diff) | |
| download | httpd-1b9fc3e72dc5226c5a79f82c69c24b36953625af.tar.gz | |
Use define for serverroot with Windows conf files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451830 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/installwinconf.awk | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/build/installwinconf.awk b/build/installwinconf.awk index fe5565fc65..456f70de87 100644 --- a/build/installwinconf.awk +++ b/build/installwinconf.awk @@ -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\"" ) } |