From bc2d30492afbcfcb88001e13229fc0f9f29022e2 Mon Sep 17 00:00:00 2001
From: Alexey Prilipko <palex@farpost.com>
Date: Thu, 5 Jul 2012 23:44:25 +1100
Subject: [PATCH] Add php proxies to replacement vars.

---
 src/Composer/Installer/PearInstaller.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Composer/Installer/PearInstaller.php b/src/Composer/Installer/PearInstaller.php
index 6b0655122..edc901438 100644
--- a/src/Composer/Installer/PearInstaller.php
+++ b/src/Composer/Installer/PearInstaller.php
@@ -54,20 +54,22 @@ class PearInstaller extends LibraryInstaller
         parent::installCode($package);
 
         $isWindows = defined('PHP_WINDOWS_VERSION_BUILD') ? true : false;
+        $php_bin = realpath($this->binDir . ($isWindows ? '/composer-php.bat' : '/composer-php'));
 
+        $installPath = $this->getInstallPath($package);
         $vars = array(
             'os' => $isWindows ? 'windows' : 'linux',
-            'php_bin' => ($isWindows ? getenv('PHPRC') .'php.exe' : trim(`which php`)),
-            'pear_php' => $this->getInstallPath($package),
-            'bin_dir' => $this->getInstallPath($package) . '/bin',
-            'php_dir' => $this->getInstallPath($package),
-            'data_dir' => '@DATA_DIR@',
+            'php_bin' => $php_bin,
+            'pear_php' => $installPath,
+            'php_dir' => $installPath,
+            'bin_dir' => $installPath . '/bin',
+            'data_dir' => $installPath . '/data',
             'version' => $package->getPrettyVersion(),
         );
 
         $packageArchive = $this->getInstallPath($package).'/'.pathinfo($package->getDistUrl(), PATHINFO_BASENAME);
         $pearExtractor = new PearPackageExtractor($packageArchive);
-        $pearExtractor->extractTo($this->getInstallPath($package), array('php' => '/', 'script' => '/bin'), $vars);
+        $pearExtractor->extractTo($this->getInstallPath($package), array('php' => '/', 'script' => '/bin', 'data' => '/data'), $vars);
 
         if ($this->io->isVerbose()) {
             $this->io->write('    Cleaning up');