- Fix library path problems

diff --git a/pear/PEAR/Config.php b/pear/PEAR/Config.php
index a4f51400fdc04c1302b4312614377a7f0fd55b05..36253c3cd00042377be1da8b963d49933492cde9 100644 (file)
--- a/pear/PEAR/Config.php
+++ b/pear/PEAR/Config.php
@@ -66,9 +66,9 @@ if (getenv('PHP_PEAR_HTTP_PROXY')) {
 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);
     }

diff --git a/pear/install-pear.php b/pear/install-pear.php
index 24b3d9a51bf671a4e44761e5cda98c7390a4e9cc..d2d1b804f9e92e61bc8c9cfa461fabe68d7839d9 100644 (file)
--- a/pear/install-pear.php
+++ b/pear/install-pear.php
@@ -46,7 +46,7 @@ if (!empty($bin_dir)) {
 // 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');