archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MFB: - Fix library path problems

Browse source
This commit is contained in:
Derick Rethans 2003-08-14 20:14:34 +00:00
parent 7881c6e0b6
commit b5cb1cbadb
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pear/PEAR/Config.php
View file

@ -66,9 +66,9 @@ if (getenv('PHP_PEAR_HTTP_PROXY')) {
if (getenv('PHP_PEAR_INSTALL_DIR')) { if (getenv('PHP_PEAR_INSTALL_DIR')) {
define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR')); define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR'));
} else { } else {
if (@is_dir($PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'lib')) { if (@is_dir($PEAR_INSTALL_DIR)) {
define('PEAR_CONFIG_DEFAULT_PHP_DIR', define('PEAR_CONFIG_DEFAULT_PHP_DIR',
$PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'lib'); $PEAR_INSTALL_DIR);
} else { } else {
define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR); define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR);
} }

2
pear/install-pear.php
View file

@ -46,7 +46,7 @@ if (!empty($bin_dir)) {
// User supplied a dir prefix // User supplied a dir prefix
if (!empty($with_dir)) { if (!empty($with_dir)) {
$ds = DIRECTORY_SEPARATOR; $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('doc_dir', $with_dir . $ds . 'doc', 'default');
$config->set('data_dir', $with_dir . $ds . 'data', 'default'); $config->set('data_dir', $with_dir . $ds . 'data', 'default');
$config->set('test_dir', $with_dir . $ds . 'test', 'default'); $config->set('test_dir', $with_dir . $ds . 'test', 'default');