summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stewart <vericgar@gentoo.org>2005-09-19 00:03:55 +0000
committerMichael Stewart <vericgar@gentoo.org>2005-09-19 00:03:55 +0000
commit58f805b62adc54f258b5ddd66306076599df3db8 (patch)
treec66489a4a8c86bb619b091c3d856671d55a94292 /eclass/depend.apache.eclass
parentDon't try to link to libdl unconditionally, use dlopen_lib from portability e... (diff)
downloadgentoo-2-58f805b62adc54f258b5ddd66306076599df3db8.tar.gz
gentoo-2-58f805b62adc54f258b5ddd66306076599df3db8.tar.bz2
gentoo-2-58f805b62adc54f258b5ddd66306076599df3db8.zip
Revert multilib as we can't have multilib apache stable yet due to policy
Diffstat (limited to 'eclass/depend.apache.eclass')
-rw-r--r--eclass/depend.apache.eclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 1fd7c62e2476..a96b5015c8de 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.22 2005/09/18 05:01:46 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.23 2005/09/19 00:03:55 vericgar Exp $
inherit multilib
@@ -44,8 +44,10 @@ APACHECTL2="/usr/sbin/apache2ctl"
##
## Paths to the server root directories
####
-APACHE1_BASEDIR="/usr/$(get_libdir)/apache"
-APACHE2_BASEDIR="/usr/$(get_libdir)/apache2"
+#APACHE1_BASEDIR="/usr/$(get_libdir)/apache"
+#APACHE2_BASEDIR="/usr/$(get_libdir)/apache2"
+APACHE1_BASEDIR="/usr/lib/apache"
+APACHE2_BASEDIR="/usr/lib/apache2"
####
## APACHE1_CONFDIR, APACHE2_CONFDIR