From: Joe Orton <jorton@apache.org>
Date: Mon, 23 Jul 2018 08:39:05 +0000 (+0000)
Subject: * config.layout: Allow configure --localstatedir to over-ride /var/www
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2445
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=638040d550c013b042d90abf2997d4d2267540aa;p=thirdparty%2Fapache%2Fhttpd.git

* config.layout: Allow configure --localstatedir to over-ride /var/www
  location in Fedora layout.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1836469 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/config.layout b/config.layout
index 76612db1f0b..8579587297b 100644
--- a/config.layout
+++ b/config.layout
@@ -133,6 +133,7 @@
 # Layout used in Fedora httpd packaging.
 <Layout Fedora>
     prefix:        /usr
+    localstatedir: /var
     exec_prefix:   ${prefix}
     bindir:        ${prefix}/bin
     sbindir:       ${prefix}/sbin
@@ -144,11 +145,10 @@
     installbuilddir: ${libdir}/httpd/build
     errordir:      ${datadir}/error
     iconsdir:      ${datadir}/icons
-    htdocsdir:     /var/www/html
+    htdocsdir:     ${localstatedir}/www/html
     manualdir:     ${datadir}/manual
-    cgidir:        /var/www/cgi-bin
+    cgidir:        ${localstatedir}/www/cgi-bin
     includedir:    ${prefix}/include/httpd
-    localstatedir: /var
     runtimedir:    /run/httpd
     logfiledir:    ${localstatedir}/log/httpd
     proxycachedir: ${localstatedir}/cache/httpd/proxy