From c82c9f0ae4317bcc2b9210b0fd61fb16d7a4041e Mon Sep 17 00:00:00 2001
From: Jakub Roztocil <jakub@roztocil.co>
Date: Sat, 2 Jan 2016 14:28:46 -0300
Subject: [PATCH] Makefile improvements

---
 CONTRIBUTING.rst |  5 +++++
 Makefile         | 14 ++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 3ffea063..ca57350d 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -80,6 +80,9 @@ Running all tests:
     # Run all tests in all of the supported and available Pythons via Tox
     make test-tox
 
+    # Run all tests for code as well as packaging, etc.
+    make test-all
+
 
 Running specific tests:
 ***********************
@@ -99,6 +102,7 @@ Running specific tests:
 
 -----
 
+See `Makefile`_ for additional development utilities.
 Don't forget to add yourself to `AUTHORS`_!
 
 
@@ -106,6 +110,7 @@ Don't forget to add yourself to `AUTHORS`_!
 .. _supported Python environments: https://github.com/jkbrzt/httpie/blob/master/tox.ini
 .. _existing issues: https://github.com/jkbrzt/httpie/issues?state=open
 .. _AUTHORS: https://github.com/jkbrzt/httpie/blob/master/AUTHORS.rst
+.. _Makefile: https://github.com/jkbrzt/httpie/blob/master/Makefile
 .. _pytest: http://pytest.org/
 .. _Style Guide for Python Code: http://python.org/dev/peps/pep-0008/
 .. _test suite: https://github.com/jkbrzt/httpie/tree/master/tests
diff --git a/Makefile b/Makefile
index 54f1ede6..ce47d6e5 100644
--- a/Makefile
+++ b/Makefile
@@ -10,14 +10,20 @@ END=" \#\#\# \033[0m\n"
 all: test
 
 uninstall-httpie:
-	@echo $(TAG)Removing existing installation of HTTPie$(END)
-	@echo "(NOTE: uninstall httpie manually if this fails)"
+	@echo $(TAG)Uninstalling httpie$(END)
 	@echo
-	- pip uninstall --yes httpie >/dev/null
-	! which http
+	- pip uninstall --yes httpie &2>/dev/null
+	@echo "Verifying…"
+	cd .. && ! python -m httpie --version &2>/dev/null
+	@echo "Done"
 	@echo
 
 uninstall-all: uninstall-httpie
+
+	@echo $(TAG)Uninstalling httpie requirements$(END)
+	- pip uninstall --yes pygments requests
+
+	@echo $(TAG)Uninstalling development requirements$(END)
 	- pip uninstall --yes -r $(REQUIREMENTS)
 
 init: uninstall-httpie