svn commit: r1874290 - in /httpd/httpd/branches/2.4.x: ./ CHANGES config.layout

[yl...@apache.org]

Author: ylavic
Date: Fri Feb 21 00:39:22 2020
New Revision: 1874290

URL: http://svn.apache.org/viewvc?rev=1874290&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/config.layout

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1872036,1872093,1872102

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1874290&r1=1874289&r2=1874290&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Fri Feb 21 00:39:22 2020
@@ -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]

Modified: httpd/httpd/branches/2.4.x/config.layout
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/config.layout?rev=1874290&r1=1874289&r2=1874290&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/config.layout (original)
+++ httpd/httpd/branches/2.4.x/config.layout Fri Feb 21 00:39:22 2020
@@ -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>
+