From: Tomas V.V.Cox <cox@php.net>
Date: Thu, 10 Jul 2003 01:34:46 +0000 (+0000)
Subject: Made the install of the config honors $INSTALL_ROOT
X-Git-Tag: BEFORE_ARG_INFO~296
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7e2c03b536a6bfc00f5e1382ca588d55ae2f0bd;p=php

Made the install of the config honors $INSTALL_ROOT
---

diff --git a/pear/install-pear.php b/pear/install-pear.php
index 1dd72d3a26..44665acc97 100644
--- a/pear/install-pear.php
+++ b/pear/install-pear.php
@@ -115,13 +115,17 @@ foreach ($install_files as $package => $instfile) {
                             'a previous PEAR installation at ' .
                             "'$ufile'. You may probably want to remove it.");
         }
-        $ui->outputData('Writing PEAR system config file at: ' . $config->files['system']);
-        $ui->outputData('You may want to add: ' . $config->get('php_dir') . ' to your php.ini include_path');
         $config->set('verbose', 1, 'default');
         foreach ($config->getKeys() as $key) {
             $data[$key] = $config->get($key);
         }
-        $config->store('system', $data);
+        $cnf_file = $config->getConfFile('system');
+        if (!empty($install_root)) {
+            $cnf_file = $install_root . DIRECTORY_SEPARATOR . $cnf_file;
+        }
+        $config->writeConfigFile($cnf_file, 'system', $data);
+        $ui->outputData('Wrote PEAR system config file at: ' . $cnf_file);
+        $ui->outputData('You may want to add: ' . $config->get('php_dir') . ' to your php.ini include_path');
     }
 }
 ?>