Merge upstream changes.

--HG--
branch : distribute
extra : rebase_source : 4f43f59bf581c692bfbe4b45a8567b089fa0173a

1 files changed, 5 insertions, 4 deletions

diff --git a/setup.py b/setup.py
index d91ea069..b7fb986b 100755
--- a/setup.py
+++ b/setup.py
@@ -44,12 +44,13 @@ scripts = []
 
 # if we are installing Distribute using "python setup.py install"
 # we need to get setuptools out of the way
+def _easy_install_marker():
+    return (len(sys.argv) == 5 and sys.argv[2] == 'bdist_egg' and
+            sys.argv[3] == '--dist-dir' and 'egg-dist-tmp-' in sys.argv[-1])
+
 def _being_installed():
     # easy_install marker
-    if (len(sys.argv) == 5 and sys.argv[2] == 'bdist_egg' and
-            sys.argv[3] == '--dist-dir'):
-        return True
-    return 'install' in sys.argv[1:]
+    return 'install' in sys.argv[1:] or _easy_install_marker()
 
 if _being_installed():
     from distribute_setup import before_install