summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stewart <vericgar@gentoo.org>2005-09-19 00:21:20 +0000
committerMichael Stewart <vericgar@gentoo.org>2005-09-19 00:21:20 +0000
commit607b1f5ec9c496262cb38a2f48ec7f31ddaaacb2 (patch)
tree5d4c233d86024956f6dc1e8914465d995e8f6ffe
parentAdded ~amd64 keyword. Closes bug #104152. (diff)
downloadgentoo-2-607b1f5ec9c496262cb38a2f48ec7f31ddaaacb2.tar.gz
gentoo-2-607b1f5ec9c496262cb38a2f48ec7f31ddaaacb2.tar.bz2
gentoo-2-607b1f5ec9c496262cb38a2f48ec7f31ddaaacb2.zip
roll with multilib afterall
-rw-r--r--eclass/depend.apache.eclass8
1 files changed, 3 insertions, 5 deletions
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index a96b5015c8de..28ccb9f87b20 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.23 2005/09/19 00:03:55 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.24 2005/09/19 00:21:20 vericgar Exp $
inherit multilib
@@ -44,10 +44,8 @@ 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/lib/apache"
-APACHE2_BASEDIR="/usr/lib/apache2"
+APACHE1_BASEDIR="/usr/$(get_libdir)/apache"
+APACHE2_BASEDIR="/usr/$(get_libdir)/apache2"
####
## APACHE1_CONFDIR, APACHE2_CONFDIR