From f008b623534ee7ebe9be9ed9881de85b97a01591 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Thu, 9 Jun 2011 11:34:16 +0000
Subject: [PATCH] Improve documentation generation procedure (copyright,
 version)

---
 configure.ac                | 3 +++
 doc/Makefile.am             | 6 +++---
 doc/{conf.py => conf.py.in} | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)
 rename doc/{conf.py => conf.py.in} (98%)

diff --git a/configure.ac b/configure.ac
index 15f3f2d..383cbf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,8 @@ AC_CONFIG_HEADER(jobmanager_config.h)
 MODULE_NAME=jobmanager
 AC_SUBST(MODULE_NAME)
 
+SHORT_VERSION=`echo $VERSION | awk -F. '{printf("%d.%d",$1,$2)}'`
+AC_SUBST(SHORT_VERSION)
 XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
 AC_SUBST(XVERSION)
 
@@ -135,4 +137,5 @@ AC_OUTPUT([ \
   src/standalone/start_jobmanager.sh \
   src/salomegui/Makefile \
   doc/Makefile \
+  doc/conf.py \
 ])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 011a67f..c32c941 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -41,13 +41,13 @@ ALLSPHINXOPTS   = -d doctrees $(PAPEROPT_a4) $(SPHINXOPTS) $(SOURCEDIR)
 
 htm:
 	mkdir -p html doctrees
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) html
+	$(SPHINXBUILD) -c $(top_builddir)/doc -b html $(ALLSPHINXOPTS) html
 	@echo
 	@echo "Build finished. The HTML pages are in html."
 
 latex:
 	mkdir -p latex doctrees
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) latex
+	$(SPHINXBUILD) -c $(top_builddir)/doc -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" \
@@ -68,7 +68,7 @@ jobmanager_gui.rst \
 advanced.rst
 
 
-EXTRA_DIST+= $(RSTFILES) conf.py
+EXTRA_DIST+= $(RSTFILES)
 
 install-data-local:
 	$(INSTALL) -d $(DESTDIR)$(jobmanagerdocdir)
diff --git a/doc/conf.py b/doc/conf.py.in
similarity index 98%
rename from doc/conf.py
rename to doc/conf.py.in
index 54870ec..053e397 100644
--- a/doc/conf.py
+++ b/doc/conf.py.in
@@ -39,16 +39,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'jobmanager'
-copyright = '2010 CEA/DEN, EDF R&D, A. Ribes'
+copyright = '2010-2011 CEA/DEN, EDF R&D, A. Ribes'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '6.2'
+version = '@SHORT_VERSION@'
 # The full version, including alpha/beta/rc tags.
-release = '6.2'
+release = '@VERSION@'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-- 
2.39.2