summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Bickel <mabi@gentoo.org>2012-02-12 21:48:58 +0000
committerMatti Bickel <mabi@gentoo.org>2012-02-12 21:48:58 +0000
commit6f61d0b6cfd2caf3da804d415d050cb36c728d40 (patch)
tree9e3550d2ef538699fdfde67ed71bbb5493584bfb /eclass/php-lib-r1.eclass
parentfix building with fox:1.7 (diff)
downloadhistorical-6f61d0b6cfd2caf3da804d415d050cb36c728d40.tar.gz
historical-6f61d0b6cfd2caf3da804d415d050cb36c728d40.tar.bz2
historical-6f61d0b6cfd2caf3da804d415d050cb36c728d40.zip
always install stuff into /usr/share/php
Diffstat (limited to 'eclass/php-lib-r1.eclass')
-rw-r--r--eclass/php-lib-r1.eclass14
1 files changed, 2 insertions, 12 deletions
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