Merge branch '1.5.X'1.5.4

Conflicts:
	CHANGES.txt

3 files changed, 11 insertions, 3 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index afad818af..cfcd82308 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,10 @@
+**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)**
 
 
diff --git a/pip/__init__.py b/pip/__init__.py
index 5466c5e76..9b4e9069d 100755
--- a/pip/__init__.py
+++ b/pip/__init__.py
@@ -19,7 +19,7 @@ import pip.cmdoptions
 cmdoptions = pip.cmdoptions
 
 # The version as used in the setup.py and the docs conf.py
-__version__ = "1.5.3"
+__version__ = "1.5.4"
 
 
 def autocomplete():
diff --git a/pip/commands/install.py b/pip/commands/install.py
index 911238abc..cbf22a086 100644
--- a/pip/commands/install.py
+++ b/pip/commands/install.py
@@ -4,7 +4,8 @@ import tempfile
 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 InstallationError, CommandError, PreviousBuildDirError
@@ -187,7 +188,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('1.7', 'DEPRECATION: --no-install, --no-download, --build, '