summaryrefslogtreecommitdiffstats
path: root/install-pear.php
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-08-13 11:33:57 +0200
committerRemi Collet <fedora@famillecollet.com>2012-08-13 11:33:57 +0200
commitbdd7b954ad27bb276a0ef0a81d4640ea7e1dab66 (patch)
tree80f2b54273dc1db63b0a7b419962e434b261f1f7 /install-pear.php
parent0bf18fff7dff14f81c4ba0b16cab92b42b3861f7 (diff)
php-pear: sync with rawhide
Diffstat (limited to 'install-pear.php')
-rw-r--r--install-pear.php14
1 files changed, 12 insertions, 2 deletions
diff --git a/install-pear.php b/install-pear.php
index 1be987e..a8ca995 100644
--- a/install-pear.php
+++ b/install-pear.php
@@ -1,5 +1,5 @@
<?php
-
+while (@ob_end_flush());
/* $Id$ */
error_reporting(1803);
@@ -75,6 +75,9 @@ for ($i = 0; $i < sizeof($argv); $i++) {
} elseif ($arg == '-t') {
$temp_dir = $argv[$i+1];
$i++;
+ } elseif ($arg == '-D') {
+ $doc_dir = $argv[$i+1];
+ $i++;
} elseif ($arg == '--debug') {
$debug = 1;
} elseif ($arg == '--extremedebug') {
@@ -131,11 +134,18 @@ if (!empty($temp_dir)) {
$config->set('temp_dir', $temp_dir, 'default');
}
+// Documentation files
+if (!empty($doc_dir)) {
+ $config->set('doc_dir', $doc_dir, 'default');
+}
+
// User supplied a dir prefix
if (!empty($with_dir)) {
$ds = DIRECTORY_SEPARATOR;
$config->set('php_dir', $with_dir, 'default');
- $config->set('doc_dir', $with_dir . $ds . 'doc', 'default');
+ if (empty($doc_dir)) {
+ $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');
if (empty($www_dir)) {