From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 21 Feb 2020 00:39:22 +0000 (+0000)
Subject: Merge r1872036, r1872093, r1872102 from trunk:
X-Git-Tag: 2.4.42~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=207d8898e8b3e8336972062ca4a7b665f62d10da;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1872036, r1872093, r1872102 from trunk:


Add a config layout for OpenWRT.


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


Correct the case on OpenWrt, the project prefers this capitalisation.


Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic


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

diff --git a/CHANGES b/CHANGES
index ce976cb8048..a053a15d670 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.42
 
+  *) Add a config layout for OpenWRT. [Graham Leggett]
+
   *) Add support for cross compiling to apxs. If apxs is being executed from somewhere
      other than its target location, add that prefix to includes and library directories.
      Without this, apxs would fail to find config_vars.mk and exit. [Graham Leggett]
diff --git a/config.layout b/config.layout
index 8579587297b..a29351ef144 100644
--- a/config.layout
+++ b/config.layout
@@ -394,3 +394,28 @@
     logfiledir:      ${localstatedir}/log/httpd
     proxycachedir:   ${localstatedir}/cache/httpd
 </Layout>
+
+# OpenWrt layout
+<Layout OpenWrt>
+    prefix:          /usr
+    exec_prefix:     ${prefix}
+    bindir:          ${prefix}/bin
+    sbindir:         ${prefix}/sbin
+    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:       /usr/share/doc/apache2/manual
+    cgidir:          ${datadir}/cgi-bin
+    includedir:      ${prefix}/include+
+    localstatedir:   /var
+    runtimedir:      ${localstatedir}/run+
+    logfiledir:      ${localstatedir}/log+
+    proxycachedir:   ${localstatedir}/cache/apache2
+</Layout>
+