summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'eclass/php-pear-lib-r1.eclass')
-rw-r--r--eclass/php-pear-lib-r1.eclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass
index 03440c8abe1a..3fb9caa134bd 100644
--- a/eclass/php-pear-lib-r1.eclass
+++ b/eclass/php-pear-lib-r1.eclass
@@ -70,16 +70,17 @@ php-pear-lib-r1_src_install() {
cd "${S}"
+ # metadata_dir needs to be set relative to ${D} for >=dev-php/PEAR-PEAR-1.10
if [[ -f "${WORKDIR}"/package2.xml ]] ; then
mv -f "${WORKDIR}/package2.xml" "${S}"
local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
- peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
+ peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" -d metadata_dir="/usr/share/php" \
install --force --loose --nodeps --offline --packagingroot="${D}" \
"${S}/package2.xml" || die "Unable to install PEAR package"
else
mv -f "${WORKDIR}/package.xml" "${S}"
local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs"
- peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \
+ peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" -d metadata_dir="/usr/share/php" \
install --force --loose --nodeps --offline --packagingroot="${D}" \
"${S}/package.xml" || die "Unable to install PEAR package"
fi