Index: sympy-0.6.5/doc/Makefile
===================================================================
--- sympy-0.6.5.orig/doc/Makefile
+++ sympy-0.6.5/doc/Makefile
@@ -1,14 +1,10 @@
 # Makefile for Sphinx documentation
 #
 PYTHON       = python
-RST2HTML     = rst2html
+RST2HTML     = rst2html.py
 
 # You can set these variables from the command line.
 SPHINXOPTS   =
-SPHINXVER    = 0.5
-#SPHINXBUILDpy  = sphinx/Sphinx-$(SPHINXVER)/sphinx-build.py
-SPHINXBUILDpy  = sphinx-build
-SPHINXBUILD  = PYTHONPATH=..:$(PYTHONPATH) $(SPHINXBUILDpy)
 PAPER        =
 
 ALLSPHINXOPTS = -d _build/doctrees -D latex_paper_size=$(PAPER) \
@@ -32,13 +28,7 @@ clean:
 	-rm -rf _build
 	-rm -rf sphinx
 
-$(SPHINXBUILDpy):
-	rm -rf sphinx
-#	mkdir sphinx
-#	cd sphinx; wget http://pypi.python.org/packages/source/S/Sphinx/Sphinx-$(SPHINXVER).tar.gz;
-#	cd sphinx; tar xzf Sphinx-$(SPHINXVER).tar.gz
-
-html: $(SPHINXBUILDpy) spt-printable
+html: spt-printable
 	mkdir -p src/.static
 	mkdir -p _build/html _build/doctrees
 	mkdir -p src/modules
@@ -53,7 +43,7 @@ spt-printable:
 	mkdir -p _build/html/
 	$(RST2HTML) src/sympy-patches-tutorial.txt > _build/html/spt-printable.html
 
-htmlapi: $(SPHINXBUILDpy)
+htmlapi:
 	mkdir -p api/.static
 	mkdir -p api/modules
 	mkdir -p _build/api _build/doctreesapi
@@ -78,7 +68,7 @@ htmlhelp:
 	@echo "Build finished; now you can run HTML Help Workshop with the" \
 	      ".hhp project file in _build/htmlhelp."
 
-latex: $(SPHINXBUILDpy)
+latex:
 	mkdir -p _build/latex _build/doctrees
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex
 	@echo