From 7d44f4eaa015cd0dee510fa43c0e341b757d8df2 Mon Sep 17 00:00:00 2001
From: Jim Paris <jim@jtan.com>
Date: Tue, 26 Feb 2013 21:55:46 -0500
Subject: [PATCH] Cleanup Makefile; make tests run through setup.py when
 outside emacs

---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a2ffb0f..7359dde 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,13 @@ lint:
 	pylint --rcfile=.pylintrc nilmdb
 
 test:
+ifeq ($(INSIDE_EMACS), t)
+# Use the slightly more flexible script
 	python tests/runtests.py
+else
+# Let setup.py check dependencies, build stuff, and run the test
+	python setup.py nosetests
+endif
 
 clean::
 	find . -name '*pyc' | xargs rm -f
@@ -33,4 +39,4 @@ clean::
 gitclean::
 	git clean -dXf
 
-.PHONY: all build dist sdist install docs lint test clean
+.PHONY: all version build dist sdist install docs lint test clean