Commits

Doug Hellmann committed 4478fa3

since we always use the same config dir, set it once

Comments (0)

Files changed (2)

 # Documentation
 .PHONY: html
 html:
-	(cd docs && $(MAKE) html SPHINXOPTS="-c sphinx" LANGUAGE="en")
-	(cd docs && $(MAKE) html SPHINXOPTS="-c sphinx" LANGUAGE="es")
+	(cd docs && $(MAKE) html LANGUAGE="en")
+	(cd docs && $(MAKE) html LANGUAGE="es")
 
 .PHONY: docclean
 docclean:
 website: 
 	[ ~/Devel/doughellmann/doughellmann/templates/base.html -nt docs/sphinx/web/templates/base.html ] && (echo "Updating base.html" ; cp ~/Devel/doughellmann/doughellmann/templates/base.html docs/sphinx/web/templates/base.html) || exit 0
 	rm -rf docs/website
-	(cd docs && $(MAKE) html BUILDING_WEB=1 SPHINXOPTS="-c sphinx" BUILDDIR="website/en" LANGUAGE="en")
-	(cd docs && $(MAKE) html BUILDING_WEB=1 SPHINXOPTS="-c sphinx" BUILDDIR="website/es" LANGUAGE="es")
+	(cd docs && $(MAKE) html BUILDING_WEB=1 BUILDDIR="website/en" LANGUAGE="en")
+	(cd docs && $(MAKE) html BUILDING_WEB=1 BUILDDIR="website/es" LANGUAGE="es")
 
 installwebsite: website
 	(cd docs/website/en && rsync --rsh=ssh --archive --delete --verbose . www.doughellmann.com:/var/www/doughellmann/DocumentRoot/docs/virtualenvwrapper/)
 LANGUAGE      = en
 
 # You can set these variables from the command line.
-SPHINXOPTS    =
+SPHINXOPTS    = -c sphinx
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = html/$(LANGUAGE)