From: Graham Leggett <minfrin@apache.org>
Date: Mon, 30 Dec 2019 00:36:00 +0000 (+0000)
Subject: Align the OpenWRT config layout with the new kayout as defined by the project.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1737
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4804414832cd86f32d09eb538bbd208ba3571afd;p=thirdparty%2Fapache%2Fhttpd.git

Align the OpenWRT config layout with the new kayout as defined by the project.


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

diff --git a/config.layout b/config.layout
index dd732dfc9c1..0528643858b 100644
--- a/config.layout
+++ b/config.layout
@@ -416,22 +416,21 @@
     exec_prefix:     ${prefix}
     bindir:          ${prefix}/bin
     sbindir:         ${prefix}/sbin
-    libdir:          ${prefix}/lib/apache
-    libexecdir:      ${prefix}/lib/apache/modules
-    installbuilddir: ${prefix}/lib/apache/build
-    mandir:          ${prefix}/man
-    sysconfdir:      /etc/apache
-    datadir:         /usr/share
+    libdir:          ${prefix}/lib
+    libexecdir:      ${prefix}/lib+
+    mandir:          ${prefix}/share/man
+    sysconfdir:      /etc+
+    datadir:         ${prefix}/share+
+    installbuilddir: ${datadir}/build
+    errordir:        ${datadir}/error
     iconsdir:        ${datadir}/icons
     htdocsdir:       ${datadir}/htdocs
-    manualdir:       ${htdocsdir}/manual
+    manualdir:       /usr/share/doc/apache2/manual
     cgidir:          ${datadir}/cgi-bin
-    errordir:        ${datadir}/error
-    includedir:      ${prefix}/include/httpd
+    includedir:      ${prefix}/include+
     localstatedir:   /var
-    runtimedir:      ${localstatedir}/run
-    statedir:        ${localstatedir}/lib/apache
-    logfiledir:      ${localstatedir}/log
-    proxycachedir:   ${localstatedir}/cache/apache
+    runtimedir:      ${localstatedir}/run+
+    logfiledir:      ${localstatedir}/log+
+    proxycachedir:   ${localstatedir}/cache/apache2
 </Layout>