summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Herbert <stuart@gentoo.org>2003-12-22 23:15:46 +0000
committerStuart Herbert <stuart@gentoo.org>2003-12-22 23:15:46 +0000
commit1adac09f0a1ee569a61dc2452743770f3bf3b0e4 (patch)
tree7721404962612482f77e121bf180578faf62b269 /eclass/webapp.eclass
parentOnly need to specify include paths for -mozilla, otherwise pkgconfig will work (diff)
downloadgentoo-2-1adac09f0a1ee569a61dc2452743770f3bf3b0e4.tar.gz
gentoo-2-1adac09f0a1ee569a61dc2452743770f3bf3b0e4.tar.bz2
gentoo-2-1adac09f0a1ee569a61dc2452743770f3bf3b0e4.zip
Fix for bug #32635
Diffstat (limited to 'eclass/webapp.eclass')
-rw-r--r--eclass/webapp.eclass7
1 files changed, 4 insertions, 3 deletions
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
index 8140b38c52d1..af4c8828b907 100644
--- a/eclass/webapp.eclass
+++ b/eclass/webapp.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.1 2003/10/07 21:54:46 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.2 2003/12/22 23:15:46 stuart Exp $
#
# eclass/webapp.eclass
# Eclass for installing applications to run under a web server
@@ -27,8 +27,8 @@ INHERITED="$INHERITED $ECLASS"
SLOT="${PVR}"
IUSE="$IUSE vhosts"
-if [ -f /usr/share/webapp-config/settings.sh ] ; then
- . /usr/share/webapp-config/settings.sh
+if [ -f /etc/conf.d/webapp-config ] ; then
+ . /etc/conf.d/webapp-config
fi
EXPORT_FUNCTIONS pkg_setup src_install
@@ -132,3 +132,4 @@ function webapp_src_install ()
function webapp_pkg_setup ()
{
use vhosts || webapp-config -u root -d /var/www/localhost/htdocs/${PN}/ ${PN}
+}