* when building, look for "package-version" subdirectory, needed for

  building stuff straight from tarballs

diff --git a/pear/PEAR/Builder.php b/pear/PEAR/Builder.php
index e67fb7e82f82bc0ce775fd4711721f32b1133c1a..f91f4b57096eebe4668e4ebda9dccd24a7fb816c 100644 (file)
--- a/pear/PEAR/Builder.php
+++ b/pear/PEAR/Builder.php
@@ -92,7 +92,13 @@ class PEAR_Builder extends PEAR_Common
         if (!@chdir($dir)) {
             return $this->raiseError("could not chdir to $dir");
         }
+        $vdir = "$info[package]-$info[version]";
+        if (is_dir($vdir)) {
+            chdir($vdir);
+        }
         $dir = getcwd();
+        $this->log(2, "building in $dir");
+        $this->_runCommand("find $dir -print", $callback);
         $this->current_callback = $callback;
         $err = $this->_runCommand("phpize", array(&$this, 'phpizeCallback'));
         if (PEAR::isError($err)) {