installwinconf.awk: install.log output tweaks; reduced path convertion

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

diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index e44217456b69a833d813a7365f3e91ebedfc919e..7147ecdd47f3d411facc8cc9e7787184ba14118e 100644 (file)
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -46,12 +46,12 @@ BEGIN {
         usertree = "C:/Documents and Settings";
     }
 
-    print "Installing Apache HTTP 2.0 server with" >tstfl;
+    print "Installing Apache HTTP Server 2.x with" >tstfl;
     print " DomainName =    " domainname >tstfl;
     print " ServerName =    " servername >tstfl;
     print " ServerAdmin =   " serveradmin >tstfl;
     print " ServerPort =    " serverport >tstfl;
-    print " ServerSslPort = " serverport >tstfl;
+    print " ServerSslPort = " serversslport >tstfl;
     print " ServerRoot =    " serverroot >tstfl;
 
     filelist["httpd.conf"] = "httpd.conf.in";
@@ -194,7 +194,6 @@ BEGIN {
           print "#LoadModule xml2enc_module modules/mod_xml2enc.so" > dstfl;
           continue;
         }
-        gsub( /^SSLMutex.*/, "SSLMutex default" );
         gsub( /@@ServerRoot@@/,   serverroot );
         gsub( /@exp_cgidir@/,     serverroot "/cgi-bin" );
         gsub( /@exp_sysconfdir@/, serverroot "/conf" );
@@ -223,9 +222,9 @@ BEGIN {
 
       if ( close(dstfl) >= 0 ) {
         print "Rewrote " srcfl "\n to " dstfl > tstfl;
-        gsub(/\//, "\\", srcfl);
         if ( sourceroot != "docs/conf/" ) {
-          if (system("del \"" srcfl "\"")) {
+          gsub(/\//, "\\", srcfl);
+          if (system("del 2>NUL \"" srcfl "\"")) {
             print "Failed to remove " srcfl > tstfl;
           } else {
             print "Successfully removed " srcfl > tstfl;
@@ -260,7 +259,7 @@ BEGIN {
     if ( sourceroot != "docs/conf/" ) {
       srcfl = confdefault "installwinconf.awk";
       gsub(/\//, "\\", srcfl);
-      if (system("del \"" srcfl "\"")) {
+      if (system("del 2>NUL \"" srcfl "\"")) {
         print "Failed to remove " srcfl > tstfl;
       } else {
         print "Successfully removed " srcfl > tstfl;