+ bindir: ${exec_prefix}/bin
+ sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib
-+ libexecdir: ${exec_prefix}/lib/apache/modules
++ libexecdir: ${libdir}/apache
+ mandir: /usr/share/man
+ infodir: /usr/share/info
+ sysconfdir: /etc/httpd
-+ datadir: ${exec_prefix}/share/apache
-+ iconsdir: /home/services/httpd/icons
-+ htdocsdir: /home/services/httpd/html
-+ manualdir: /home/services/httpd/manual
-+ errordir: /home/services/httpd/error
-+ cgidir: /home/services/httpd/cgi-bin
-+ includedir: ${exec_prefix}/include/apache
++ datadir: /home/services/httpd
++ iconsdir: ${datadir}/icons
++ htdocsdir: ${datadir}/html
++ manualdir: ${datadir}/manual
++ errordir: ${datadir}/error
++ cgidir: ${prefix}/lib/cgi-bin/apache
++ includedir: ${prefix}/include/apache
+ localstatedir: /var/lib/httpd
+ runtimedir: /var/run
+ logfiledir: /var/log/httpd
-+ proxycachedir: /var/cache/apache
-+ installbuilddir: ${exec_prefix}/lib/apache/build
++ proxycachedir: /var/cache/httpd
++ installbuilddir: ${libexecdir}/build
+</Layout>
-diff -urN httpd-2.0.45.org/srclib/apr/config.layout httpd-2.0.45/srclib/apr/config.layout
---- httpd-2.0.45.org/srclib/apr/config.layout Thu Apr 3 09:27:43 2003
-+++ httpd-2.0.45/srclib/apr/config.layout Thu Apr 3 09:30:15 2003
-@@ -229,3 +229,30 @@
- infodir: ${exec_prefix}/share/info
- libsuffix: -${APR_MAJOR_VERSION}
- </Layout>
-+
-+
-+# PLD layout
-+<Layout PLD>
-+ prefix: /usr
-+ exec_prefix: ${prefix}
-+ bindir: ${exec_prefix}/bin
-+ sbindir: ${exec_prefix}/sbin
-+ libdir: ${exec_prefix}/lib
-+ libexecdir: ${exec_prefix}/lib/apache/modules
-+ mandir: /usr/share/man
-+ infodir: /usr/share/info
-+ sysconfdir: /etc/httpd
-+ datadir: ${exec_prefix}/share/apache
-+ iconsdir: /home/services/httpd/icons
-+ htdocsdir: /home/services/httpd/html
-+ manualdir: /home/services/httpd/manual
-+ errordir: /home/services/httpd/error
-+ cgidir: /home/services/httpd/cgi-bin
-+ includedir: ${exec_prefix}/include/apache
-+ localstatedir: /var/lib/httpd
-+ runtimedir: /var/run
-+ logfiledir: /var/log/httpd
-+ proxycachedir: /var/cache/apache
-+ installbuilddir: ${exec_prefix}/lib/apache/build
-+</Layout>
-+
-diff -urN httpd-2.0.45.org/srclib/apr-util/config.layout httpd-2.0.45/srclib/apr-util/config.layout
---- httpd-2.0.45.org/srclib/apr-util/config.layout Thu Apr 3 09:27:44 2003
-+++ httpd-2.0.45/srclib/apr-util/config.layout Thu Apr 3 09:30:28 2003
-@@ -229,3 +229,29 @@
- infodir: ${exec_prefix}/share/info
- libsuffix -${APRUTIL_MAJOR_VERSION}
- </Layout>
-+
-+# PLD layout
-+<Layout PLD>
-+ prefix: /usr
-+ exec_prefix: ${prefix}
-+ bindir: ${exec_prefix}/bin
-+ sbindir: ${exec_prefix}/sbin
-+ libdir: ${exec_prefix}/lib
-+ libexecdir: ${exec_prefix}/lib/apache/modules
-+ mandir: /usr/share/man
-+ infodir: /usr/share/info
-+ sysconfdir: /etc/httpd
-+ datadir: ${exec_prefix}/share/apache
-+ iconsdir: /home/services/httpd/icons
-+ htdocsdir: /home/services/httpd/html
-+ manualdir: /home/services/httpd/manual
-+ errordir: /home/services/httpd/error
-+ cgidir: /home/services/httpd/cgi-bin
-+ includedir: ${exec_prefix}/include/apache
-+ localstatedir: /var/lib/httpd
-+ runtimedir: /var/run
-+ logfiledir: /var/log/httpd
-+ proxycachedir: /var/cache/apache
-+ installbuilddir: ${exec_prefix}/lib/apache/build
-+</Layout>
-+