summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichael Stewart <vericgar@gentoo.org>2005-09-18 05:01:46 +0000
committerMichael Stewart <vericgar@gentoo.org>2005-09-18 05:01:46 +0000
commit0fa6e00770c3cfb826ae79675d1d1e639740a465 (patch)
tree78f23261a277085392ac9d87f466d7f76d3ec8b9 /eclass
parentChanges to make apache multilib aware (diff)
downloadgentoo-2-0fa6e00770c3cfb826ae79675d1d1e639740a465.tar.gz
gentoo-2-0fa6e00770c3cfb826ae79675d1d1e639740a465.tar.bz2
gentoo-2-0fa6e00770c3cfb826ae79675d1d1e639740a465.zip
Changes to make apache multilib aware
Diffstat (limited to '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 e3448b1643e8..1fd7c62e2476 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -1,6 +1,8 @@
# 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.21 2005/09/10 20:21:51 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.22 2005/09/18 05:01:46 vericgar Exp $
+
+inherit multilib
######
## Apache Common Variables
@@ -42,8 +44,8 @@ APACHECTL2="/usr/sbin/apache2ctl"
##
## Paths to the server root directories
####
-APACHE1_BASEDIR="/usr/lib/apache"
-APACHE2_BASEDIR="/usr/lib/apache2"
+APACHE1_BASEDIR="/usr/$(get_libdir)/apache"
+APACHE2_BASEDIR="/usr/$(get_libdir)/apache2"
####
## APACHE1_CONFDIR, APACHE2_CONFDIR