For docutils documentation: conf.py should be generated automatically (for version number)

This commit is contained in:
vsr 2010-12-13 14:56:56 +00:00
parent 9d59c1d055
commit db23033585
3 changed files with 5 additions and 7 deletions

View File

@ -463,6 +463,7 @@ AC_OUTPUT([ \
SMESH_version.h \
doc/Makefile \
doc/docutils/Makefile \
doc/docutils/conf.py \
doc/salome/Makefile \
doc/salome/gui/Makefile \
doc/salome/gui/SMESH/Makefile \

View File

@ -47,7 +47,7 @@ htm:
mkdir -p html doctrees
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \
LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \
$(SPHINXBUILD) -W -b html $(ALLSPHINXOPTS) html
$(SPHINXBUILD) -c $(builddir) -W -b html $(ALLSPHINXOPTS) html
@echo
@echo "Build finished. The HTML pages are in html."
@ -55,7 +55,7 @@ latex:
mkdir -p latex doctrees
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH}; \
LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH}; \
$(SPHINXBUILD) -W -b latex $(ALLSPHINXOPTS) latex
$(SPHINXBUILD) -c $(builddir) -W -b latex $(ALLSPHINXOPTS) latex
@echo
@echo "Build finished; the LaTeX files are in latex."
@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
@ -71,9 +71,6 @@ RSTFILES= \
EXTRA_DIST+= $(RSTFILES)
EXTRA_DIST+= \
conf.py
install-data-local: html/index.html
test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir)
if test -d "html"; then b=; else b="$(srcdir)/"; fi; \

View File

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