diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2003-12-09 05:02:59 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-12-09 05:02:59 +0000 |
| commit | 53e591d8676710cec8c22b371496c2cf486e9209 (patch) | |
| tree | 701fcd573a180756e3d64115afbdc86b6db31de9 /eclass/php-2.eclass | |
| parent | removed ancient versions (diff) | |
| download | historical-53e591d8676710cec8c22b371496c2cf486e9209.tar.gz historical-53e591d8676710cec8c22b371496c2cf486e9209.tar.bz2 historical-53e591d8676710cec8c22b371496c2cf486e9209.zip | |
fix bug #15622 properly, sed mistake before
Diffstat (limited to 'eclass/php-2.eclass')
| -rw-r--r-- | eclass/php-2.eclass | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/eclass/php-2.eclass b/eclass/php-2.eclass index e2e04352cc28..b82bd1302825 100644 --- a/eclass/php-2.eclass +++ b/eclass/php-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-2.eclass,v 1.2 2003/11/23 01:41:27 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-2.eclass,v 1.3 2003/12/09 05:02:59 robbat2 Exp $ # Author: Robin H. Johnson <robbat2@gentoo.org> # This EBUILD is totally masked presently. Use it at your own risk. I know it @@ -203,7 +203,7 @@ php_src_unpack() { # fix PEAR installer for our packaging # we keep a backup of it as we need it at the end of the install cp pear/PEAR/Registry.php pear/PEAR/Registry.old - sed -e "s:\$pear_install_dir\.:\'${D}/usr/lib/php/\' . :g" -i pear/PEAR/Registry.old + sed -e "s:\$pear_install_dir\.:\'${D}/usr/lib/php/\' . :g" -i pear/PEAR/Registry.php } @@ -442,9 +442,7 @@ php_src_install() { # only php-core has the PEAR stuff if [ "${PN}" = "php-core" ]; then #revert Pear patch - rm ${D}/usr/lib/php/PEAR/Registry.php - #should this possibly result to the SAME original value it was ? (\$pear_install_dir) - cat ${S}/pear/PEAR/Registry.old | sed -e 's:${PORTAGE_TMPDIR}/${PF}::' > ${D}/usr/lib/php/PEAR/Registry.php + cp ${S}/pear/PEAR/Registry.old ${D}/usr/lib/php/PEAR/Registry.php fi # Support for Java extension |