diff options
| author | Derick Rethans <derick@php.net> | 2003-08-14 20:14:34 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2003-08-14 20:14:34 +0000 |
| commit | b5cb1cbadb0975c0261ff9263a3d9df36a2cfab9 (patch) | |
| tree | b03a4b7c22d042037a9cd7374ae42663dca065c2 | |
| parent | 7881c6e0b6e4dd8076464dc62a40de96a0407d53 (diff) | |
| download | php-git-b5cb1cbadb0975c0261ff9263a3d9df36a2cfab9.tar.gz | |
MFB: - Fix library path problems
| -rw-r--r-- | pear/PEAR/Config.php | 4 | ||||
| -rw-r--r-- | pear/install-pear.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pear/PEAR/Config.php b/pear/PEAR/Config.php index a4f51400fd..36253c3cd0 100644 --- 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 24b3d9a51b..d2d1b804f9 100644 --- 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'); |