]> granicus.if.org Git - php/commitdiff
* fix path prepends
authorStig Bakken <ssb@php.net>
Fri, 8 Nov 2002 00:19:21 +0000 (00:19 +0000)
committerStig Bakken <ssb@php.net>
Fri, 8 Nov 2002 00:19:21 +0000 (00:19 +0000)
pear/PEAR/Installer.php

index e97a9cabc5097ac0fcc3d5f5f14e7d8ae0e69e7e..e6507a35adf3e552634e4b5f9f6b1df4e4f620df 100644 (file)
@@ -563,7 +563,7 @@ class PEAR_Installer extends PEAR_Common
 
             if ($this->source_files > 0 && empty($options['nobuild'])) {
                 $this->log(1, "$this->source_files source files, building");
-                $bob = &new PEAR_Builder($this->ui); // Malin loves Bob the Builder
+                $bob = &new PEAR_Builder($this->ui);
                 $bob->debug = $this->debug;
                 $built = $bob->build($descfile, array(&$this, '_buildCallback'));
                 if (PEAR::isError($built)) {
@@ -574,8 +574,7 @@ class PEAR_Installer extends PEAR_Common
                     $this->log(2, "installing $bn");
                     $dest = $this->config->get('ext_dir') . DIRECTORY_SEPARATOR . $bn;
                     $this->log(3, "+ cp $ext[file] ext_dir");
-                    //$copyto = $dest->_prependPath($dest, $this->installroot);
-                    $copyto = $dest;
+                    $copyto = $this->_prependPath($dest, $this->installroot);
                     if (!@copy($ext['file'], $copyto)) {
                         return $this->raiseError("failed to copy $bn to $copyto");
                     }