PEAR binaries go where the php bin goes

diff --git a/pear/Makefile.frag b/pear/Makefile.frag
index 6fbba54dfbc90fb48d5c0be4165cd9954121cd18..a74392b2d3719e4ea84976013a57b7ad7cff5356 100644 (file)
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@ -6,10 +6,10 @@ peardir=$(PEAR_INSTALLDIR)
 PEAR_INSTALL_FLAGS = -n -dsafe_mode=0
 
 install-pear-installer: $(top_builddir)/sapi/cli/php
-       @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" $(srcdir)/package-*.xml
+       @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" $(srcdir)/package-*.xml
 
 install-pear-packages: $(top_builddir)/sapi/cli/php
-       @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" $(srcdir)/packages/*.tar
+       @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" $(srcdir)/packages/*.tar
 
 install-pear:
        @echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"

diff --git a/pear/install-pear.php b/pear/install-pear.php
index 44665acc974a313464ec2a87dffa91e4243ecb1d..24b3d9a51bf671a4e44761e5cda98c7390a4e9cc 100644 (file)
--- a/pear/install-pear.php
+++ b/pear/install-pear.php
@@ -23,6 +23,9 @@ for ($i = 0; $i < sizeof($argv); $i++) {
     } elseif ($arg == '-d') {
         $with_dir = $argv[$i+1];
         $i++;
+    } elseif ($arg == '-b') {
+        $bin_dir = $argv[$i+1];
+        $i++;
     }
 }
 
@@ -36,11 +39,14 @@ foreach ($config_layers as $layer) {
 }
 $keys = $config->getKeys();
 $config->set('verbose', 0, 'default');
+// PEAR executables
+if (!empty($bin_dir)) {
+    $config->set('bin_dir', $bin_dir, 'default');
+}
 // User supplied a dir prefix
 if (!empty($with_dir)) {
     $ds = DIRECTORY_SEPARATOR;
     $config->set('php_dir', $with_dir . $ds . 'lib', 'default');
-    $config->set('bin_dir', $with_dir . $ds . 'bin', 'default');
     $config->set('doc_dir', $with_dir . $ds . 'doc', 'default');
     $config->set('data_dir', $with_dir . $ds . 'data', 'default');
     $config->set('test_dir', $with_dir . $ds . 'test', 'default');