From 9028546c5aa0d66cce5336faba64a628e2acffec Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Sat, 3 Dec 2011 20:47:02 +0100
Subject: [PATCH] Move bin dir to a subdir of vendor

---
 src/Composer/Console/Application.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php
index fc9474b12..c78c9569c 100644
--- a/src/Composer/Console/Application.php
+++ b/src/Composer/Console/Application.php
@@ -92,7 +92,6 @@ class Application extends BaseApplication
         // Configuration defaults
         $composerConfig = array(
             'vendor-dir' => 'vendor',
-            'bin-dir' => 'bin',
         );
 
         $packageConfig = $file->read();
@@ -104,6 +103,9 @@ class Application extends BaseApplication
         }
 
         $vendorDir = $packageConfig['config']['vendor-dir'];
+        if (!isset($packageConfig['config']['bin-dir'])) {
+            $packageConfig['config']['bin-dir'] = $vendorDir.'/bin';
+        }
         $binDir = $packageConfig['config']['bin-dir'];
 
         // initialize repository manager