Bug #18666 PEAR doesn't honor the ext_dir configuration variable

pear · Dec 10, 2011 · f7bfb93 · f7bfb93
1 parent d528b37
commit f7bfb93
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/PEAR/Builder.php b/PEAR/Builder.php
@@ -424,7 +424,11 @@ function build($descfile, $callback = null, $options = array())
         $prefix = exec($this->config->get('php_prefix')
                         . "php-config" .
                        $this->config->get('php_suffix') . " --prefix");
-        $this->_harvestInstDir($prefix, $inst_dir . DIRECTORY_SEPARATOR . $prefix, $built_files);
+        $ext_dir = $this->config->get('ext_dir');
+        if (!$ext_dir) {
+            $ext_dir = $prefix;
+        }
+        $this->_harvestInstDir($ext_dir, $inst_dir . DIRECTORY_SEPARATOR . $prefix, $built_files);
 
         chdir($old_cwd);
         return $built_files;
@@ -522,4 +526,4 @@ function log($level, $msg)
 
         return PEAR_Common::log($level, $msg);
     }
-}
+}
diff --git a/PEAR/Command/Install.php b/PEAR/Command/Install.php
@@ -380,7 +380,7 @@ function enableExtension($binaries, $type)
             $newini = array();
         }
         foreach ($binaries as $binary) {
-            if ($ini['extension_dir']) {
+            if (!$this->config->get('ext_dir') && $ini['extension_dir']) {
                 $binary = basename($binary);
             }
             $newini[] = $enable . '="' . $binary . '"' . (OS_UNIX ? "\n" : "\r\n");
@@ -1265,4 +1265,4 @@ function _filterUptodatePackages($packages, $command)
 
         return $ret;
     }
-}
+}