Merge branch 'master' into develop

Conflicts:
	CHANGES.txt
	pip/__init__.py

CHANGES.txt

@@ -3,6 +3,13 @@
 * **BACKWARD INCOMPATIBLE** Dropped support for Python 3.1.
 
 
+**1.5.4 (2014-02-21)**
+
+
+* Correct deprecation warning for ``pip install --build`` to only notify when
+  the `--build` value is different than the default.
+
+
 **1.5.3 (2014-02-20)**
 
 

pip/commands/install.py

@@ -4,7 +4,8 @@ import shutil
 
 from pip.req import InstallRequirement, RequirementSet, parse_requirements
 from pip.log import logger
-from pip.locations import src_prefix, virtualenv_no_global, distutils_scheme
+from pip.locations import (src_prefix, virtualenv_no_global, distutils_scheme,
+                           build_prefix)
 from pip.basecommand import Command
 from pip.index import PackageFinder
 from pip.exceptions import (
@@ -206,7 +207,7 @@ class InstallCommand(Command):
         if (
             options.no_install or
             options.no_download or
-            options.build_dir or
+            (options.build_dir != build_prefix) or
             options.no_clean
         ):
             logger.deprecated(