Use README.rst instead of README.md

1 files changed, 7 insertions, 14 deletions

diff --git a/makefile b/makefile
index 83dc4f2..07e8696 100644
--- a/makefile
+++ b/makefile
@@ -1,41 +1,34 @@
-.PHONY: test upload clean bootstrap setup assert-converted-readme
+.PHONY: test test-all upload register clean bootstrap
 
 test: bootstrap
 	_virtualenv/bin/nosetests tests
 
-test-all: setup
+test-all:
 	_virtualenv/bin/tox
 	make clean
 	
-upload: setup assert-converted-readme jq.c
+upload: jq.c
 	python setup.py sdist upload
 	make clean
 	
-register: setup
+register:
 	python setup.py register
 
-README:
-	pandoc --from=markdown --to=rst README.md > README || cp README.md README
-
-assert-converted-readme:
-	test "`cat README`" != "`cat README.md`"
-
 clean:
-	rm -f README
 	rm -f MANIFEST
 	rm -rf dist
 	
-bootstrap: _virtualenv jq.c setup
+bootstrap: _virtualenv jq.c
 	_virtualenv/bin/pip install -e .
 ifneq ($(wildcard test-requirements.txt),) 
 	_virtualenv/bin/pip install -r test-requirements.txt
 endif
 	make clean
 
-setup: README
-
 _virtualenv: 
 	virtualenv _virtualenv
+	_virtualenv/bin/pip install --upgrade pip
+	_virtualenv/bin/pip install --upgrade setuptools
 
 jq.c: _virtualenv jq.pyx
 	_virtualenv/bin/pip install cython