svn: /pear/pear-core/tags/PEAR-1.9.3/ PEAR/Builder.php package.xml package2.xml

[Helgi Þormar Þorbjörnsson]

dufuz Tue, 31 May 2011 02:55:30 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=311615

Log:
Fixed a bug with extensions not providing their config.m4 and co in the root directory of their pecl package but rather in a sub directory, such as xhprof. [dufuz]

Changed paths:
U pear/pear-core/tags/PEAR-1.9.3/PEAR/Builder.php
U pear/pear-core/tags/PEAR-1.9.3/package.xml
U pear/pear-core/tags/PEAR-1.9.3/package2.xml

Modified: pear/pear-core/tags/PEAR-1.9.3/PEAR/Builder.php
===================================================================
--- pear/pear-core/tags/PEAR-1.9.3/PEAR/Builder.php 2011-05-30 23:26:33 UTC (rev 311614)
+++ pear/pear-core/tags/PEAR-1.9.3/PEAR/Builder.php 2011-05-31 02:55:30 UTC (rev 311615)
@@ -287,6 +287,14 @@
$dir = dirname($descfile);
}

+ // Find config. outside of normal path - e.g. config.m4
+ foreach (array_keys($pkg->getInstallationFileList()) as $item) {
+ if (stristr($item, 'config.')) {
+ $dir .= DIRECTORY_SEPARATOR . dirname($item);
+ break;
+ }
+ }
+
$old_cwd = getcwd();
if (!file_exists($dir) || !is_dir($dir) || !chdir($dir)) {
return $this->raiseError("could not chdir to $dir");

Modified: pear/pear-core/tags/PEAR-1.9.3/package.xml
===================================================================
--- pear/pear-core/tags/PEAR-1.9.3/package.xml 2011-05-30 23:26:33 UTC (rev 311614)
+++ pear/pear-core/tags/PEAR-1.9.3/package.xml 2011-05-31 02:55:30 UTC (rev 311615)
@@ -98,6 +98,8 @@
* Fixed Bug #18388: Parenteses error in REST.php line 232 [dufuz]
* Fixed a problem in RunTest and code coverage. Correctly register the
code coverage shutdown function in case we are inside a namespace. [sebastian]
+ * Fixed a bug with extensions not providing their config.m4 and co in the root directory
+ of their pecl package but rather in a sub directory, such as xhprof. [dufuz]
</notes>
<deps>
<dep type="php" rel="ge" version="4.4.0"/>

Modified: pear/pear-core/tags/PEAR-1.9.3/package2.xml
===================================================================
--- pear/pear-core/tags/PEAR-1.9.3/package2.xml 2011-05-30 23:26:33 UTC (rev 311614)
+++ pear/pear-core/tags/PEAR-1.9.3/package2.xml 2011-05-31 02:55:30 UTC (rev 311615)
@@ -100,6 +100,8 @@
* Fixed Bug #18388: Parenteses error in REST.php line 232 [dufuz]
* Fixed a problem in RunTest and code coverage. Correctly register the
code coverage shutdown function in case we are inside a namespace. [sebastian]
+ * Fixed a bug with extensions not providing their config.m4 and co in the root directory of
+ their pecl package but rather in a sub directory, such as xhprof. [dufuz]
</notes>
<contents>
<dir name="/">