From f85ff933110a3dc87e4ec4de833cb0fe7dfa171f Mon Sep 17 00:00:00 2001
From: Olaf Rempel <razzor@kopf-tisch.de>
Date: Sun, 5 Nov 2006 16:59:07 +0100
Subject: [PATCH] added apache layouts

---
 Makefile        |  7 +++----
 apache2-layouts | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 apache2-layouts

diff --git a/Makefile b/Makefile
index f835c55..8a32aee 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,7 @@ $(_DOWNLOADS)/$(PACKAGE_APACHE2):
 $(SOURCE_APACHE2)/.unpacked: $(_DOWNLOADS)/$(PACKAGE_APACHE2)
 	mkdir -p $(SOURCE_APACHE2)
 	tar -C $(_SOURCES) -xjf $(_DOWNLOADS)/$(PACKAGE_APACHE2)
+	cat apache2-layouts >> $(SOURCE_APACHE2)/config.layout
 	touch $@
 
 $(_DOWNLOADS)/$(PACKAGE_RPAF):
@@ -82,7 +83,7 @@ $(_BUILD_APACHE2_FRONTEND)/.configured: $(SOURCE_APACHE2)/.unpacked
 	mkdir -p $(_BUILD_APACHE2_FRONTEND)
 	( cd $(_BUILD_APACHE2_FRONTEND); \
 	    $(SOURCE_APACHE2)/configure \
-	    	--prefix=$(DESTDIR)/apache2-frontend/ \
+		--enable-layout=Frontend \
 		--with-mpm=worker \
 		--enable-proxy \
 		--enable-proxy-http \
@@ -115,7 +116,7 @@ $(_BUILD_APACHE2_BACKEND)/.configured: $(SOURCE_APACHE2)/.unpacked
 	mkdir -p $(_BUILD_APACHE2_BACKEND)
 	( cd $(_BUILD_APACHE2_BACKEND); \
 	    $(SOURCE_APACHE2)/configure \
-	    	--prefix=$(DESTDIR)/apache2-backend/ \
+		--enable-layout=Backend \
 		--with-mpm=prefork \
 		--enable-so \
 	);
@@ -129,7 +130,6 @@ $(_BUILD_APACHE2_BACKEND)/.installed: $(_BUILD_APACHE2_BACKEND)/.compiled
 	make -C $(_BUILD_APACHE2_BACKEND) install
 	touch $@
 
-
 $(SOURCE_RPAF)/.compiled: $(SOURCE_RPAF)/.unpacked $(_BUILD_APACHE2_BACKEND)/.installed
 	make -C $(SOURCE_RPAF) APXS=$(DESTDIR)/apache2-backend/bin/apxs rpaf-2.0
 	touch $@
@@ -138,7 +138,6 @@ $(SOURCE_RPAF)/.installed: $(SOURCE_RPAF)/.compiled
 	make -C $(SOURCE_RPAF) APXS=$(DESTDIR)/apache2-backend/bin/apxs install-2.0
 	touch $@
 
-
 $(_BUILD_APACHE2_BACKEND_PHP)/.configured: $(SOURCE_PHP4)/.unpacked $(_BUILD_APACHE2_BACKEND)/.installed
 	mkdir -p $(_BUILD_APACHE2_BACKEND_PHP)
 	( cd $(_BUILD_APACHE2_BACKEND_PHP); \
diff --git a/apache2-layouts b/apache2-layouts
new file mode 100644
index 0000000..84c72a8
--- /dev/null
+++ b/apache2-layouts
@@ -0,0 +1,45 @@
+<Layout Frontend>
+    prefix:        /opt/apache2-fe
+    exec_prefix:   ${prefix}
+    bindir:        ${exec_prefix}/bin
+    sbindir:       ${exec_prefix}/bin
+    libdir:        ${exec_prefix}/lib
+    libexecdir:    ${exec_prefix}/modules
+    mandir:        ${prefix}/man
+    sysconfdir:    /etc/apache2-fe/
+    datadir:       ${prefix}
+    installbuilddir: ${datadir}/build
+    errordir:      ${datadir}/error
+    iconsdir:      ${datadir}/icons
+    htdocsdir:     ${datadir}/htdocs
+    manualdir:     ${datadir}/manual
+    cgidir:        ${datadir}/cgi-bin
+    includedir:    ${prefix}/include
+    localstatedir: ${prefix}
+    runtimedir:    /var/log/apache2-fe/
+    logfiledir:    /var/log/apache2-fe/
+    proxycachedir: ${localstatedir}/proxy
+</Layout>
+
+<Layout Backend>
+    prefix:        /opt/apache2-be
+    exec_prefix:   ${prefix}
+    bindir:        ${exec_prefix}/bin
+    sbindir:       ${exec_prefix}/bin
+    libdir:        ${exec_prefix}/lib
+    libexecdir:    ${exec_prefix}/modules
+    mandir:        ${prefix}/man
+    sysconfdir:    /etc/apache2-be/
+    datadir:       ${prefix}
+    installbuilddir: ${datadir}/build
+    errordir:      ${datadir}/error
+    iconsdir:      ${datadir}/icons
+    htdocsdir:     ${datadir}/htdocs
+    manualdir:     ${datadir}/manual
+    cgidir:        ${datadir}/cgi-bin
+    includedir:    ${prefix}/include
+    localstatedir: ${prefix}
+    runtimedir:    /var/log/apache2-be/
+    logfiledir:    /var/log/apache2-be/
+    proxycachedir: ${localstatedir}/proxy
+</Layout>