From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 21 Dec 2007 17:04:57 +0000 (+0000)
Subject: The installer will now create a temp-extras directory
X-Git-Tag: 2.2.7~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=113ef269cf807a6480635ca1b440cd4b900d67c4;p=thirdparty%2Fapache%2Fhttpd.git

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 f15cf0e9ecd..27dabd04bf8 100644
--- 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;
       }