summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Leggett <minfrin@apache.org>2019-12-30 01:36:00 +0100
committerGraham Leggett <minfrin@apache.org>2019-12-30 01:36:00 +0100
commit4804414832cd86f32d09eb538bbd208ba3571afd (patch)
treea33759ecb243305e103842a20afa6db77647fd2b
parenttest/travis_before_linux.sh: move retry logic to function (diff)
downloadapache2-4804414832cd86f32d09eb538bbd208ba3571afd.tar.xz
apache2-4804414832cd86f32d09eb538bbd208ba3571afd.zip
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
-rw-r--r--config.layout25
1 files changed, 12 insertions, 13 deletions
diff --git a/config.layout b/config.layout
index dd732dfc9c..0528643858 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>