unify sphinx config files

--HG--
rename : docs/sphinx/pkg/conf.py => docs/sphinx/conf.py

Author: dhellmann

Makefile

@@ -38,8 +38,8 @@ sdist: html
 # Documentation
 .PHONY: html
 html:
-	(cd docs && $(MAKE) html SPHINXOPTS="-c sphinx/pkg" LANGUAGE="en")
-	(cd docs && $(MAKE) html SPHINXOPTS="-c sphinx/pkg" LANGUAGE="es")
+	(cd docs && $(MAKE) html SPHINXOPTS="-c sphinx" LANGUAGE="en")
+	(cd docs && $(MAKE) html SPHINXOPTS="-c sphinx" LANGUAGE="es")
 
 .PHONY: docclean
 docclean:
@@ -50,8 +50,8 @@ 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 SPHINXOPTS="-c sphinx/web" BUILDDIR="website/en" LANGUAGE="en")
-	(cd docs && $(MAKE) html SPHINXOPTS="-c sphinx/web" BUILDDIR="website/es" LANGUAGE="es")
+	(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")
 
 installwebsite: website
 	(cd docs/website/en && rsync --rsh=ssh --archive --delete --verbose . www.doughellmann.com:/var/www/doughellmann/DocumentRoot/docs/virtualenvwrapper/)

docs/sphinx/pkg/conf.py docs/sphinx/conf.pydocs/sphinx/pkg/conf.py renamed to docs/sphinx/conf.py

@@ -13,6 +13,8 @@
 
 import sys, os
 
+building_web = int(os.environ.get('BUILDING_WEB', '0'))
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -27,7 +29,10 @@
 bitbucket_project_url = 'http://bitbucket.org/dhellmann/virtualenvwrapper/'
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['templates']
+if building_web:
+    templates_path = ['web/templates']
+else:
+    templates_path = ['pkg/templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -93,7 +98,10 @@
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'sphinxdoc'
+if building_web:
+    html_theme = 'default'
+else:
+    html_theme = 'sphinxdoc'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the