Fix-up docutils conf file (version)

This commit is contained in:
vsr 2011-07-27 14:26:29 +00:00
parent 69df0142b3
commit 300e285152
2 changed files with 27 additions and 30 deletions

View File

@ -24,14 +24,12 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
pydocdir = $(docdir)/tui/SMESH/docutils pydocdir = $(docdir)/tui/SMESH/docutils
.PHONY : latex RSTFILES = \
index.rst \
overview.rst \
docapi.rst
if SPHINX_IS_OK EXTRA_DIST += $(RSTFILES)
html/index.html:$(RSTFILES)
make htm
endif
SPHINXOPTS = SPHINXOPTS =
SOURCEDIR = $(srcdir) SOURCEDIR = $(srcdir)
@ -43,37 +41,36 @@ SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$
SPHINX_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib SPHINX_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib
htm:
.PHONY: latex
if SPHINX_IS_OK
html/index.html:$(RSTFILES)
mkdir -p html doctrees mkdir -p html doctrees
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \ PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \ LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
$(SPHINXBUILD) -W -b html $(ALLSPHINXOPTS) html $(SPHINXBUILD) -c $(top_builddir)/doc/docutils -W -b html $(ALLSPHINXOPTS) html
@echo @echo
@echo "Build finished. The HTML pages are in html." @echo "Build finished. The HTML pages are in html."
else
html/index.html:
@echo "Documentation for Python package not built. Sphinx was not present at configure time."
endif
latex: latex:
mkdir -p latex doctrees mkdir -p latex doctrees
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \ PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \ LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
$(SPHINXBUILD) -W -b latex $(ALLSPHINXOPTS) latex $(SPHINXBUILD) -c $(top_builddir)/doc/docutils -W -b latex $(ALLSPHINXOPTS) latex
@echo @echo
@echo "Build finished; the LaTeX files are in latex." @echo "Build finished; the LaTeX files are in latex."
@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
"run these through (pdf)latex." "run these through (pdf)latex."
html:
mkdir -p $@
RSTFILES= \
index.rst \
overview.rst \
docapi.rst
EXTRA_DIST+= $(RSTFILES)
EXTRA_DIST+= \
conf.py
install-data-local: html/index.html install-data-local: html/index.html
test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir) test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir)
if test -d "html"; then b=; else b="$(srcdir)/"; fi; \ if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
@ -87,5 +84,5 @@ clean-local:
-rm -rf html latex doctrees -rm -rf html latex doctrees
if test -d "html"; then rm -rf html ; fi if test -d "html"; then rm -rf html ; fi
disthook : dist-hook:
-test -d html && cp -Rp html $(distdir) -test -d html && cp -Rp html $(distdir)

View File

@ -54,9 +54,9 @@ copyright = '2010 EDF R&D'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '5.1.5' version = '@VERSION@'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '5.1.5' release = '@VERSION@'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.