- updated

[packages/rpm.git] / php-pear-build-macros

diff --git a/php-pear-build-macros b/php-pear-build-macros
index a0e792a487945246f56619e98ce87720c2f7fce8..1ef6d88bacf1621682b6ee36aaec178fdb67db08 100644 (file)
--- a/php-pear-build-macros
+++ b/php-pear-build-macros
@@ -3,9 +3,12 @@
 %define        pear_package_setup(a:) \
 %setup -q -c -T\
 D=%{_builddir}/%{name}-%{version} \
-sh %{_bindir}/pear \\\
+pear \\\
        -d doc_dir=/docs \\\
+       -d php_dir=%{php_pear_dir} \\\
+       -d bin_dir=%{_bindir} \\\
        -d data_dir=%{php_pear_dir}/data \\\
+       -d test_dir=%{php_pear_dir}/tests \\\
        install \\\
        --installroot=${D} \\\
        --offline \\\
@@ -17,7 +20,7 @@ test -s optional-packages.txt || rm -f optional-packages.txt \
 rm ./%{php_pear_dir}/.{lock,filemap} \
 # undos sources \
 find . -type f -print0 | xargs -0 sed -i -e 's,\\r$,,' \
-# don't know why installroot stays in installed files. PEAR bug? \
+# bug in PEAR --installroot. \
 grep -rl "${D}" ./{%{_bindir},%{php_pear_dir}}/* | xargs -r sed -i -e "s,${D},," \
 %{nil}