cvs: php4 /pear/PEAR Config.php

ssb Mon May 27 18:27:40 2002 EDT Modified files: /php4/pear/PEAR Config.php Log: * change root for documentation files to <peardir>/docs Index: php4/pear/PEAR/Config.php diff -u php4/pear/PEAR/Config.php:1.23 php4/pear/PEAR/Config.php:1.24 --- php4/pear/PEAR/Config.php:1.23 Mon May 27 15:37:17 2002 +++ php4/pear/PEAR/Config.php Mon May 27 18:27:40 2002 @@ -16,7 +16,7 @@ // | Author: Stig Bakken <ssb@fast.no> | // +----------------------------------------------------------------------+ // -// $Id: Config.php,v 1.23 2002/05/27 19:37:17 ssb Exp $ +// $Id: Config.php,v 1.24 2002/05/27 22:27:40 ssb Exp $ require_once 'PEAR.php'; @@ -26,8 +26,17 @@ */ $GLOBALS['_PEAR_Config_instance'] = null; +define('PEAR_CONFIG_DEFAULT_BINDIR', + PHP_BINDIR); define('PEAR_CONFIG_DEFAULT_DOCDIR', - PHP_DATADIR.DIRECTORY_SEPARATOR.'doc'.DIRECTORY_SEPARATOR.'pear'); + PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'docs'); +define('PEAR_CONFIG_DEFAULT_PHPDIR', +// PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'lib'); + PEAR_INSTALL_DIR); +define('PEAR_CONFIG_DEFAULT_DATADIR', + PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'data'); +define('PEAR_CONFIG_DEFAULT_TESTDIR', + PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'tests'); define('PEAR_DEFAULT_UMASK', umask()); // in case a --without-pear PHP installation is used @@ -91,7 +100,7 @@ ), 'php_dir' => array( 'type' => 'directory', - 'default' => PEAR_INSTALL_DIR, + 'default' => PEAR_CONFIG_DEFAULT_PHPDIR, 'doc' => 'directory where .php files are installed', ), 'ext_dir' => array( @@ -106,7 +115,7 @@ ), 'bin_dir' => array( 'type' => 'directory', - 'default' => PHP_BINDIR, + 'default' => PEAR_CONFIG_DEFAULT_BINDIR, 'doc' => 'directory where executables are installed', ), 'username' => array(