diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2005-09-11 16:39:10 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2005-09-11 16:39:10 +0000 |
| commit | 575d75baf5eaf53d5af2f336b32ca78dbae4a96c (patch) | |
| tree | 55477e4a77fd0a3f0cde732c862b0d98ce1e5e8b /eclass/php-lib-r1.eclass | |
| parent | Added thanks to Jan Kundrát to ChangeLog (diff) | |
| download | gentoo-2-575d75baf5eaf53d5af2f336b32ca78dbae4a96c.tar.gz gentoo-2-575d75baf5eaf53d5af2f336b32ca78dbae4a96c.tar.bz2 gentoo-2-575d75baf5eaf53d5af2f336b32ca78dbae4a96c.zip | |
fix pear bug + minor fixes
Diffstat (limited to 'eclass/php-lib-r1.eclass')
| -rw-r--r-- | eclass/php-lib-r1.eclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/eclass/php-lib-r1.eclass b/eclass/php-lib-r1.eclass index 905a4eab120a..faef92ecff28 100644 --- a/eclass/php-lib-r1.eclass +++ b/eclass/php-lib-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-lib-r1.eclass,v 1.1 2005/09/04 10:54:53 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-lib-r1.eclass,v 1.2 2005/09/11 16:39:10 hollow Exp $ # # Author: Stuart Herbert <stuart@gentoo.org> # @@ -23,18 +23,19 @@ EXPORT_FUNCTIONS src_install # ---end ebuild configurable settings DEPEND="${DEPEND} dev-lang/php" +RDEPEND="${RDEPEND} ${DEPEND}" # you have to pass in a list of the PHP files to install # # $1 - directory in ${S} to insert from # $2 ... list of files to install -php-lib_src_install() { +php-lib-r1_src_install() { has_php # install to the correct phpX folder, if not specified # fall back to /usr/share/php - if [ -z "${PHP_SHARED_CAT}" ] ; then + if [ -n "${PHP_SHARED_CAT}" ] ; then PHP_LIB_DIR="/usr/share/${PHP_SHARED_CAT}/${PHP_LIB_NAME}" else PHP_LIB_DIR="/usr/share/php/${PHP_LIB_NAME}" |