From db23033585cdc1b2c28ce05cc0aac075bb6c10e1 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Mon, 13 Dec 2010 14:56:56 +0000
Subject: [PATCH] For docutils documentation: conf.py should be generated
 automatically (for version number)

---
 configure.ac                         | 1 +
 doc/docutils/Makefile.am             | 7 ++-----
 doc/docutils/{conf.py => conf.py.in} | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)
 rename doc/docutils/{conf.py => conf.py.in} (99%)

diff --git a/configure.ac b/configure.ac
index eaba8df96..9fd33f5ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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 \
diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am
index a757dd6f7..1d61c5f63 100644
--- a/doc/docutils/Makefile.am
+++ b/doc/docutils/Makefile.am
@@ -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; \
diff --git a/doc/docutils/conf.py b/doc/docutils/conf.py.in
similarity index 99%
rename from doc/docutils/conf.py
rename to doc/docutils/conf.py.in
index aebd4b163..b2bb21f71 100644
--- a/doc/docutils/conf.py
+++ b/doc/docutils/conf.py.in
@@ -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.
-- 
2.39.2