From defe5766a45d223788293dc06c461edf0bc59e3b Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 18 Jul 2012 18:41:07 +0200
Subject: [PATCH] Revert "Merge remote-tracking branch
 'till/bugfix-broken-classmap'"

This reverts commit d837b8a6570e4182a9f63ce68e3a9fc4b5a3891a, reversing
changes made to 520d91586014f931e23211222473f141abee8752.
---
 src/Composer/Autoload/AutoloadGenerator.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index 6bc06aa52..f86489214 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -118,15 +118,8 @@ EOF;
         $autoloads['classmap'] = new \RecursiveIteratorIterator(new \RecursiveArrayIterator($autoloads['classmap']));
         foreach ($autoloads['classmap'] as $dir) {
             foreach (ClassMapGenerator::createMap($dir) as $class => $path) {
-
-                $classmapFile .= '    '.var_export($class, true) . ' => ';
-
-                if (0 === strpos($path, dirname($vendorPath), 0)) {
-                    // this path seems to be located within this application/package
-                    $path = '/' . $filesystem->findShortestPath(getcwd(), $path, true);
-                    $classmapFile .= '$baseDir . ';
-                }
-                $classmapFile .= var_export($path, true).",\n";
+                $path = '/'.$filesystem->findShortestPath(getcwd(), $path, true);
+                $classmapFile .= '    '.var_export($class, true).' => $baseDir . '.var_export($path, true).",\n";
             }
         }
         $classmapFile .= ");\n";