Merge branch '1.3'
This commit is contained in:
commit
781bda1404
@ -1,7 +1,8 @@
|
|||||||
EXTRA_DIST = CHANGES LICENSE README.rst
|
EXTRA_DIST = CHANGES LICENSE README.rst
|
||||||
SUBDIRS = doc src test
|
SUBDIRS = doc src test
|
||||||
|
|
||||||
check-local: html
|
check-doc:
|
||||||
|
$(MAKE) SPHINXOPTS_EXTRA=-W html
|
||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = jansson.pc
|
pkgconfig_DATA = jansson.pc
|
||||||
|
@ -3,7 +3,7 @@ EXTRA_DIST = conf.py apiref.rst changes.rst conformance.rst \
|
|||||||
ext/refcounting.py
|
ext/refcounting.py
|
||||||
|
|
||||||
SPHINXBUILD = sphinx-build
|
SPHINXBUILD = sphinx-build
|
||||||
SPHINXOPTS = -d _build/doctrees -W
|
SPHINXOPTS = -d _build/doctrees $(SPHINXOPTS_EXTRA)
|
||||||
|
|
||||||
html-local:
|
html-local:
|
||||||
$(SPHINXBUILD) -b html $(SPHINXOPTS) $(srcdir) _build/html
|
$(SPHINXBUILD) -b html $(SPHINXOPTS) $(srcdir) _build/html
|
||||||
|
Loading…
Reference in New Issue
Block a user