summaryrefslogtreecommitdiff
path: root/docs/Makefile
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-11-28 16:19:04 -0500
committerChris McDonough <chrism@plope.com>2011-11-28 16:19:04 -0500
commitdafb0b3271f525fb8552d155a4dd840ced1656c8 (patch)
tree786cccbf8f2287be8e2fa43afd33e503b5366739 /docs/Makefile
parent8786a5719950900ba7a8390323476076e737ac9e (diff)
parent14e5fa938b5354154f724101f444b1826b01aa3a (diff)
downloadpyramid-dafb0b3271f525fb8552d155a4dd840ced1656c8.tar.gz
pyramid-dafb0b3271f525fb8552d155a4dd840ced1656c8.tar.bz2
pyramid-dafb0b3271f525fb8552d155a4dd840ced1656c8.zip
merge master to feature.introspection
Diffstat (limited to 'docs/Makefile')
-rw-r--r--docs/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/docs/Makefile b/docs/Makefile
index 373d549af..bb381fc53 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -23,9 +23,9 @@ help:
@echo " linkcheck to check all external links for integrity"
clean:
- -rm -rf _build/* _themes
+ -rm -rf _build/*
-html: _themes
+html:
mkdir -p _build/html _build/doctrees
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
@echo
@@ -47,7 +47,7 @@ pickle:
web: pickle
-htmlhelp: _themes
+htmlhelp:
mkdir -p _build/htmlhelp _build/doctrees
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
@echo
@@ -84,5 +84,3 @@ epub:
@echo
@echo "Build finished. The epub file is in _build/epub."
-_themes:
- cd ..; git submodule update --init; cd docs