diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 3 | ||||
| -rwxr-xr-x | doc/python_api/sphinx_doc_gen.sh | 7 |
3 files changed, 3 insertions, 9 deletions
diff --git a/GNUmakefile b/GNUmakefile index ffde7885301..e4b5f3b99dc 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -517,7 +517,7 @@ doc_py: .FORCE ASAN_OPTIONS=halt_on_error=0 \ $(BLENDER_BIN) --background -noaudio --factory-startup \ --python doc/python_api/sphinx_doc_gen.py - cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out + sphinx-build -b html doc/python_api/sphinx-in doc/python_api/sphinx-out @echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'" doc_doxy: .FORCE diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 7e9a42a721a..9526e236f20 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -41,8 +41,7 @@ Sphinx: HTML generation After you have built doc/python_api/sphinx-in (see above), generate html docs by running: - cd doc/python_api - sphinx-build sphinx-in sphinx-out + sphinx-build doc/python_api/sphinx-in doc/python_api/sphinx-out Sphinx: PDF generation diff --git a/doc/python_api/sphinx_doc_gen.sh b/doc/python_api/sphinx_doc_gen.sh index 1c5b9ec0b61..be11a10d053 100755 --- a/doc/python_api/sphinx_doc_gen.sh +++ b/doc/python_api/sphinx_doc_gen.sh @@ -76,11 +76,7 @@ fi # Generate HTML (sphinx) if $DO_OUT_HTML ; then - # sphinx-build -n -b html $SPHINX_WORKDIR/sphinx-in $SPHINX_WORKDIR/sphinx-out - - # annoying bug in sphinx makes it very slow unless we do this. should report. - cd $SPHINX_WORKDIR - sphinx-build -b html sphinx-in sphinx-out + sphinx-build -b html $SPHINX_WORKDIR/sphinx-in $SPHINX_WORKDIR/sphinx-out # XXX, saves space on upload and zip, should move HTML outside # and zip up there, for now this is OK @@ -107,7 +103,6 @@ fi # Generate PDF (sphinx/laytex) if $DO_OUT_PDF ; then - cd $SPHINX_WORKDIR sphinx-build -n -b latex $SPHINX_WORKDIR/sphinx-in $SPHINX_WORKDIR/sphinx-out make -C $SPHINX_WORKDIR/sphinx-out mv $SPHINX_WORKDIR/sphinx-out/contents.pdf \ |