Pear install in 4.3.3rc4-dev

Hello, recent changes in PEAR changed the default package install directory from /usr/local/lib/php to /usr/local/lib/php/lib. This changes breaks every existing PEAR install around because: - The old installed packages are in a different directory - The default (that's holy for shared hosters) include path is /usr/local/lib/php and thus people would need to add lib/ in front of every include/require to a pear package. Anyway, bad move and something that should definitely NOT be done in an upgrade from 4.3.2 to 4.3.3. Attached patch addresses the issues and makes it work as it should again. regards, Derick -- ------------------------------------------------------------------------- Derick Rethans http://derickrethans.nl/ JDI Media Solutions http://www.jdimedia.nl/ International PHP Magazine http://www.php-mag.net/ -------------------------------------------------------------------------

Index: install-pear.php =================================================================== RCS file: /repository/php-src/pear/install-pear.php,v retrieving revision 1.6.2.9 diff -u -r1.6.2.9 install-pear.php --- install-pear.php 6 Aug 2003 01:58:29 -0000 1.6.2.9 +++ install-pear.php 14 Aug 2003 15:08:54 -0000 @@ -46,7 +46,7 @@ // User supplied a dir prefix if (!empty($with_dir)) { $ds = DIRECTORY_SEPARATOR; - $config->set('php_dir', $with_dir . $ds . 'lib', 'default'); + $config->set('php_dir', $with_dir, 'default'); $config->set('doc_dir', $with_dir . $ds . 'doc', 'default'); $config->set('data_dir', $with_dir . $ds . 'data', 'default'); $config->set('test_dir', $with_dir . $ds . 'test', 'default'); Index: PEAR/Config.php =================================================================== RCS file: /repository/php-src/pear/PEAR/Config.php,v retrieving revision 1.35.2.10 diff -u -r1.35.2.10 Config.php --- PEAR/Config.php 6 Aug 2003 01:58:30 -0000 1.35.2.10 +++ PEAR/Config.php 14 Aug 2003 15:08:55 -0000 @@ -66,9 +66,9 @@ if (getenv('PHP_PEAR_INSTALL_DIR')) { define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR')); } else { - if (@is_dir($PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'lib')) { + if (@is_dir($PEAR_INSTALL_DIR)) { define('PEAR_CONFIG_DEFAULT_PHP_DIR', - $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'lib'); + $PEAR_INSTALL_DIR); } else { define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR); }