Commit 0636a342 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

install.log output tweaks; reduced path convertion. 

Backport r1390511.
Submitted/backported by: fuankg
Reviewed by: druggeri, gsmith


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1466739 13f79535-47bb-0310-9956-ffa450edef68
parent fb54aa5d

build/installwinconf.awk

+5 −5
Original line number Diff line number Diff line
@@ -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";
@@ -191,9 +191,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;
@@ -228,7 +228,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;