Patch pear_honor_the_ext_dir_configuration_variable.patch for Unknown/Other Function Bug #55196

Patch version 2011-07-13 02:55 UTC

• 2011-07-13 02:55 UTC [diff to current]

Developer: kalessin@kalessin.fr

Index: PEAR/Builder.php
===================================================================
--- PEAR/Builder.php	(revision 313186)
+++ PEAR/Builder.php	(working copy)
@@ -424,7 +424,11 @@
         $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 @@
 
         return PEAR_Common::log($level, $msg);
     }
-}
\ No newline at end of file
+}
Index: PEAR/Command/Install.php
===================================================================
--- PEAR/Command/Install.php	(revision 313186)
+++ PEAR/Command/Install.php	(working copy)
@@ -380,7 +380,7 @@
             $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 @@
 
         return $ret;
     }
-}
\ No newline at end of file
+}