Support DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT environment

variable to allow to disable installation of easy_install-${version} script.

--HG--
branch : distribute
extra : rebase_source : 9a278ec5528955480faee8f9192295b3b8e77b5b

2 files changed, 7 insertions, 5 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 542424d1..55662218 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ CHANGES
 0.6.17
 ------
 
+* Support 'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT' environment
+  variable to allow to disable installation of easy_install-${version} script.
 * Support Python >=3.1.4 and >=3.2.1.
 
 ------
diff --git a/setup.py b/setup.py
index f2a3a6d9..21db64c3 100755
--- a/setup.py
+++ b/setup.py
@@ -45,6 +45,10 @@ from setuptools.command.test import test as _test
 
 scripts = []
 
+console_scripts = ["easy_install = setuptools.command.easy_install:main"]
+if os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") is None:
+    console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3])
+
 # specific command that is used to generate windows .exe files
 class build_py(_build_py):
     def build_package_data(self):
@@ -182,11 +186,7 @@ dist = setup(
             "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
         ],
 
-        "console_scripts": [
-             "easy_install = setuptools.command.easy_install:main",
-             "easy_install-%s = setuptools.command.easy_install:main"
-                % sys.version[:3]
-        ],
+        "console_scripts": console_scripts,
 
         "setuptools.file_finders":
             ["svn_cvs = setuptools.command.sdist:_default_revctrl"],