summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Bakken <ssb@php.net>2002-05-27 22:27:40 +0000
committerStig Bakken <ssb@php.net>2002-05-27 22:27:40 +0000
commit076202e02c8ac4a650c51a5b31d8c64760b1a471 (patch)
treeebc65b79aba83d9265daca481461ba05843f67dc
parent731f6a2a97f17fb3a8e95858b75fb6e5d2f4e5f7 (diff)
downloadphp-git-076202e02c8ac4a650c51a5b31d8c64760b1a471.tar.gz
* change root for documentation files to <peardir>/docs
-rw-r--r--pear/PEAR/Config.php15
1 files changed, 12 insertions, 3 deletions
diff --git a/pear/PEAR/Config.php b/pear/PEAR/Config.php
index 3db3f41086..09c1cef3ed 100644
--- a/pear/PEAR/Config.php
+++ b/pear/PEAR/Config.php
@@ -26,8 +26,17 @@ require_once 'PEAR.php';
*/
$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 @@ class PEAR_Config extends PEAR
),
'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 @@ class PEAR_Config extends PEAR
),
'bin_dir' => array(
'type' => 'directory',
- 'default' => PHP_BINDIR,
+ 'default' => PEAR_CONFIG_DEFAULT_BINDIR,
'doc' => 'directory where executables are installed',
),
'username' => array(