walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

doc: fix out-of-tree doc builds 

Fixes multiple errors while making docs:

    Could not import extension sphinxcontrib.rubydomain (exception: No module named 'sphinxcontrib')

and

    ../../doc/sources/index.rst:15: WARNING: toctree contains reference to nonexisting document 'nghttp.1'
    ../../doc/sources/index.rst:15: WARNING: toctree contains reference to nonexisting document 'nghttpd.1'
    ../../doc/sources/index.rst:15: WARNING: toctree contains reference to nonexisting document 'nghttpx.1'
    ../../doc/sources/index.rst:15: WARNING: toctree contains reference to nonexisting document 'h2load.1'
    ../../doc/sources/index.rst:15: WARNING: toctree contains reference to nonexisting document 'programmers-guide'
This commit is contained in:
Peter Wu 2016-02-13 14:36:12 +01:00
parent 17215002a1
commit a6effb4d23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/Makefile.am
View File

@ -145,15 +145,18 @@ APIDOCS= \
nghttp2_submit_window_update.rst \ nghttp2_submit_window_update.rst \
nghttp2_version.rst nghttp2_version.rst
EXTRA_DIST = \ RST_FILES = \
mkapiref.py \
README.rst \ README.rst \
programmers-guide.rst \ programmers-guide.rst \
$(APIDOCS) \
nghttp.1.rst \ nghttp.1.rst \
nghttpd.1.rst \ nghttpd.1.rst \
nghttpx.1.rst \ nghttpx.1.rst \
h2load.1.rst \ h2load.1.rst
EXTRA_DIST = \
mkapiref.py \
$(RST_FILES) \
$(APIDOCS) \
sources/index.rst \ sources/index.rst \
sources/tutorial-client.rst \ sources/tutorial-client.rst \
sources/tutorial-server.rst \ sources/tutorial-server.rst \
@ -227,7 +230,8 @@ help:
apiref.rst: \ apiref.rst: \
$(top_builddir)/lib/includes/nghttp2/nghttp2ver.h \ $(top_builddir)/lib/includes/nghttp2/nghttp2ver.h \
$(top_builddir)/lib/includes/nghttp2/nghttp2.h $(top_srcdir)/lib/includes/nghttp2/nghttp2.h
for i in $(RST_FILES); do [ -e $(builddir)/$$i ] || cp $(srcdir)/$$i $(builddir); done
$(PYTHON) $(top_srcdir)/doc/mkapiref.py \ $(PYTHON) $(top_srcdir)/doc/mkapiref.py \
apiref.rst macros.rst enums.rst types.rst . $^ apiref.rst macros.rst enums.rst types.rst . $^

2
doc/conf.py.in
View File

@ -41,7 +41,7 @@ import sys, os
# documentation root, use os.path.abspath to make it absolute, like shown here. # documentation root, use os.path.abspath to make it absolute, like shown here.
#sys.path.insert(0, os.path.abspath('.')) #sys.path.insert(0, os.path.abspath('.'))
sys.path.append(os.path.abspath('_exts')) sys.path.append(os.path.abspath('@top_srcdir@/doc/_exts'))
# -- General configuration ----------------------------------------------------- # -- General configuration -----------------------------------------------------