diff options
| author |   Matti Bickel <mabi@gentoo.org> | 2012-02-12 21:48:58 +0000 |
|---|---|---|
| committer | Matti Bickel <mabi@gentoo.org> | 2012-02-12 21:48:58 +0000 |
| commit | ea9ff2ac1fd3cd44dfa8411e8edd4bbd5d4c12d2 (patch) | |
| tree | 19eb4e9f9f2d9a742eba8c68a9d6684d651e7d78 /eclass | |
| parent | fix building with fox:1.7 (diff) | |
| download | gentoo-2-ea9ff2ac1fd3cd44dfa8411e8edd4bbd5d4c12d2.tar.gz gentoo-2-ea9ff2ac1fd3cd44dfa8411e8edd4bbd5d4c12d2.tar.bz2 gentoo-2-ea9ff2ac1fd3cd44dfa8411e8edd4bbd5d4c12d2.zip | |
always install stuff into /usr/share/php
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 11 | ||||
| -rw-r--r-- | eclass/php-lib-r1.eclass | 14 |
2 files changed, 9 insertions, 16 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 86579540ef8c..041e87d2d888 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.130 2012/02/12 21:45:28 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.131 2012/02/12 21:48:58 mabi Exp $ + + 12 Feb 2012; Matti Bickel <mabi@gentoo.org> php-lib-r1.eclass: + always install stuff into /usr/share/php + + 12 Feb 2012; Matti Bickel <mabi@gentoo.org> fox.eclass: + fix eclass to also support building apps with fox:1.7 12 Feb 2012; Magnus Granberg <zorry@gentoo.org> toolchain.eclass: PaX mark cc1 and cc1plus for bug 301299 @@ -34,9 +40,6 @@ 09 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> gnustep-base.eclass: Use check on configuration file instead of has_version for EAPI0 ebuilds - 12 Feb 2012; Matti Bickel <mabi@gentoo.org> fox.eclass: - fix eclass to also support building apps with fox:1.7 - 08 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> gnustep-base.eclass: Force clang when using experimental libobjc2 support diff --git a/eclass/php-lib-r1.eclass b/eclass/php-lib-r1.eclass index e09098367419..9961eeb5b6af 100644 --- a/eclass/php-lib-r1.eclass +++ b/eclass/php-lib-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.10 2011/08/22 04:46:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-lib-r1.eclass,v 1.11 2012/02/12 21:48:58 mabi Exp $ # @ECLASS: php-lib-r1.eclass # @MAINTAINER: @@ -38,16 +38,6 @@ RDEPEND="${DEPEND}" # $1 - directory in ${S} to insert from # $2 ... list of files to install php-lib-r1_src_install() { - has_php - - # install to the correct phpX folder, if not specified - # fall back to /usr/share/php - 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}" - fi - local x S_DIR="$1" @@ -55,7 +45,7 @@ php-lib-r1_src_install() { for x in $@ ; do SUBDIR="$(dirname ${x})" - insinto "${PHP_LIB_DIR}/${SUBDIR}" + insinto "/usr/share/php/${PHP_LIB_NAME}/${SUBDIR}" doins "${S_DIR}/${x}" done |