diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2007-02-02 19:09:33 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2007-02-02 19:09:33 +0000 |
| commit | 1f93b3967860fe04b02c09bd890c462b6697065e (patch) | |
| tree | 2dd447075acacf66d03e6f924e2a67486198d75d /eclass | |
| parent | Stable on sparc (diff) | |
| download | gentoo-2-1f93b3967860fe04b02c09bd890c462b6697065e.tar.gz gentoo-2-1f93b3967860fe04b02c09bd890c462b6697065e.tar.bz2 gentoo-2-1f93b3967860fe04b02c09bd890c462b6697065e.zip | |
Fix Paludis installs.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/depend.php.eclass | 4 | ||||
| -rw-r--r-- | eclass/php-ext-base-r1.eclass | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/eclass/depend.php.eclass b/eclass/depend.php.eclass index dc3862d5b525..cff0b1aaa58a 100644 --- a/eclass/depend.php.eclass +++ b/eclass/depend.php.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.php.eclass,v 1.16 2006/08/07 07:10:16 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.17 2007/02/02 19:09:33 chtekk Exp $ # # ======================================================================== # @@ -50,6 +50,7 @@ uses_php4() { PHPCGI="/usr/${libdir}/php4/bin/php-cgi" PHP_PKG="`best_version =dev-lang/php-4*`" PHPPREFIX="/usr/${libdir}/php4" + EXT_DIR="`${PHPCONFIG} --extension-dir 2>/dev/null`" einfo einfo "Using ${PHP_PKG}" @@ -87,6 +88,7 @@ uses_php5() { PHPCGI="/usr/${libdir}/php5/bin/php-cgi" PHP_PKG="`best_version =dev-lang/php-5*`" PHPPREFIX="/usr/${libdir}/php5" + EXT_DIR="`${PHPCONFIG} --extension-dir 2>/dev/null`" einfo einfo "Using ${PHP_PKG}" diff --git a/eclass/php-ext-base-r1.eclass b/eclass/php-ext-base-r1.eclass index 4da1cd3cd2f6..c0bb1221784d 100644 --- a/eclass/php-ext-base-r1.eclass +++ b/eclass/php-ext-base-r1.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/php-ext-base-r1.eclass,v 1.4 2005/11/20 01:35:05 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.5 2007/02/02 19:09:33 chtekk Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # Author: Stuart Herbert <stuart@gentoo.org> @@ -29,9 +29,6 @@ EXPORT_FUNCTIONS src_install # (defaults to "yes" and shouldn't be changed in most cases) [ -z "${PHP_EXT_INI}" ] && PHP_EXT_INI="yes" -# find out where to install extensions -EXT_DIR="`${PHPCONFIG} --extension-dir 2>/dev/null`" - # ---end ebuild configurable settings DEPEND="${DEPEND} |