diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-28 12:34:01 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-28 12:34:01 -0500 |
| commit | 69d09d906230c9f22699075c1ea07970b21e8ab4 (patch) | |
| tree | d9f1f65280b75503cad0c5f58809e38aa0864b44 /docs/Makefile | |
| parent | 0c1c39b02f1e0348d8e317972601e2db514db103 (diff) | |
| parent | fd685bae73933434b4c4fd0689898407fd4f9058 (diff) | |
| download | pyramid-69d09d906230c9f22699075c1ea07970b21e8ab4.tar.gz pyramid-69d09d906230c9f22699075c1ea07970b21e8ab4.tar.bz2 pyramid-69d09d906230c9f22699075c1ea07970b21e8ab4.zip | |
resolve conflict
Diffstat (limited to 'docs/Makefile')
| -rw-r--r-- | docs/Makefile | 8 |
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 |