From b80f1ee41e18839814d0b55823920c7e28626834 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Fri, 12 Sep 2003 12:18:54 +0000
Subject: [PATCH] apache patch cleanup

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1379 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/rene/apache/apache.conf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/rene/apache/apache.conf b/package/rene/apache/apache.conf
index 387927eb2..82f3696c6 100644
--- a/package/rene/apache/apache.conf
+++ b/package/rene/apache/apache.conf
@@ -26,14 +26,16 @@ if [ $prefix_auto = 1 ] ; then
 	else
 	  prefix="opt/apache"
 	fi
+	set_confopt
 fi
 
+datadir="$localstatedir/lib"
 set_confopt
 
 if [ $pkg = "apache" ] ; then
 	# or maybe www would be nicer than lib ?!? ...
-	var_append extraconfopt " " "--datadir=$localstatedir/lib \
---enable-dav --enable-cache --enable-disk-cache --enable-ssl --enable-proxy \
+	var_append extraconfopt " " "--enable-dav --enable-cache \
+--enable-disk-cache --enable-ssl --enable-proxy \
 --enable-speling --enable-rewrite --enable-so"
 
 	hook_add postmake 3 "install_init httpd $confdir/httpd.init"