--- ./config.layout.orig	2004-11-21 13:50:36.000000000 -0500
+++ ./config.layout	2010-05-06 19:37:54.214731918 -0400
@@ -281,17 +281,17 @@
   bindir:        ${exec_prefix}/bin
   sbindir:       ${exec_prefix}/sbin
   libdir:        ${exec_prefix}/lib
-  libexecdir:    ${exec_prefix}/libexec/apache2
+  libexecdir:    ${exec_prefix}/libexec/apache22
   mandir:        ${prefix}/man
-  sysconfdir:    ${prefix}/etc/apache2
-  datadir:       ${prefix}/www
-  installbuilddir: ${prefix}/share/apache2/build
+  sysconfdir:    ${prefix}/etc/apache22
+  datadir:       ${prefix}/www/apache22
+  installbuilddir: ${prefix}/share/apache22/build
   errordir:      ${datadir}/error
   iconsdir:      ${datadir}/icons
   htdocsdir:     ${datadir}/data
-  manualdir:     ${prefix}/share/doc/apache2
+  manualdir:     ${prefix}/share/doc/apache22
   cgidir:        ${datadir}/cgi-bin
-  includedir:    ${prefix}/include/apache2
+  includedir:    ${prefix}/include/apache22
   localstatedir: /var
   runtimedir:    ${localstatedir}/run
   logfiledir:    ${localstatedir}/log