The installer will now create a temp-extras directory

Backports: r606251

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

diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index f15cf0e9ecd8cb03f2198bf6c57cf7e93ad86169..27dabd04bf8f697ab7cc4ef415f66aee23f6b49b 100644 (file)
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -36,10 +36,6 @@ BEGIN {
 
     if ( sourceroot != "docs/conf/" ) {
         sourceroot = confroot;
-        extrapath = "";
-    }
-    else {
-        extrapath = "extra/";
     }
 
     print "Installing Apache HTTP 2.0 server with" >tstfl;
@@ -70,7 +66,7 @@ BEGIN {
         dstfl = confdefault conffile;
        bswarning = 1;
       } else {
-        srcfl = sourceroot extrapath filelist[conffile];
+        srcfl = sourceroot "extra/" filelist[conffile];
         dstfl = confdefault "extra/" conffile;
         bswarning = 0;
       }