Add layout for Fedora.
--- httpd-2.4.3/config.layout.layout
+++ httpd-2.4.3/config.layout
@@ -370,3 +370,27 @@
logfiledir: ${localstatedir}/log/httpd
proxycachedir: ${localstatedir}/cache/httpd
</Layout>
+
+# Fedora/RHEL layout
+<Layout Fedora>
+ prefix: /usr
+ exec_prefix: ${prefix}
+ bindir: ${prefix}/bin
+ sbindir: ${prefix}/sbin
+ libdir: ${prefix}/lib
+ libexecdir: ${prefix}/libexec
+ mandir: ${prefix}/man
+ sysconfdir: /etc/httpd/conf
+ datadir: ${prefix}/share/httpd
+ installbuilddir: ${libdir}/httpd/build
+ errordir: ${datadir}/error
+ iconsdir: ${datadir}/icons
+ localstatedir: /var
+ htdocsdir: ${localstatedir}/www/html
+ manualdir: ${datadir}/manual
+ cgidir: ${localstatedir}/www/cgi-bin
+ includedir: ${prefix}/include/httpd
+ runtimedir: ${localstatedir}/run/httpd
+ logfiledir: /var/log/httpd24
+ proxycachedir: ${localstatedir}/cache/httpd/proxy
+</Layout>
diff --git a/config.layout b/config.layout
index b471568..6860f3f 100644
--- a/config.layout
+++ b/config.layout
@@ -128,31 +128,7 @@
runtimedir: ${localstatedir}/run
logfiledir: ${localstatedir}/log/httpd
proxycachedir: ${localstatedir}/cache/httpd
-</Layout>
-
-# Layout used in Fedora httpd packaging.
-<Layout Fedora>
- prefix: /usr
- exec_prefix: ${prefix}
- bindir: ${prefix}/bin
- sbindir: ${prefix}/sbin
- libdir: ${prefix}/lib
- libexecdir: ${prefix}/libexec
- mandir: ${prefix}/man
- sysconfdir: /etc/httpd/conf
- datadir: ${prefix}/share/httpd
- installbuilddir: ${libdir}/httpd/build
- errordir: ${datadir}/error
- iconsdir: ${datadir}/icons
- htdocsdir: /var/www/html
- manualdir: ${datadir}/manual
- cgidir: /var/www/cgi-bin
- includedir: ${prefix}/include/httpd
- localstatedir: /var
- runtimedir: /run/httpd
- logfiledir: ${localstatedir}/log/httpd
- proxycachedir: ${localstatedir}/cache/httpd/proxy
-</Layout>
+</Layout>
# According to the /opt filesystem conventions
<Layout opt>