From 1f21d80b1bd736e29c02d754528794e25952127a Mon Sep 17 00:00:00 2001 From: rnc Date: Fri, 5 Apr 2013 16:52:04 +0000 Subject: [PATCH] fixed the version number in the Yams plug-in documentation, the @VERSION@ variable is now used to generate a conf.py file with the right version number --- configure.ac | 1 + src/Tools/YamsPlug/doc/Makefile.am | 3 ++- src/Tools/YamsPlug/doc/{conf.py => conf.py.in} | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) rename src/Tools/YamsPlug/doc/{conf.py => conf.py.in} (98%) diff --git a/configure.ac b/configure.ac index b152c0465..cea113226 100644 --- a/configure.ac +++ b/configure.ac @@ -577,6 +577,7 @@ AC_OUTPUT([ \ src/Tools/MeshCut/Makefile \ src/Tools/YamsPlug/Makefile \ src/Tools/YamsPlug/doc/Makefile \ + src/Tools/YamsPlug/doc/conf.py \ src/Tools/padder/Makefile \ src/Tools/padder/meshjob/Makefile \ src/Tools/padder/meshjob/idl/Makefile \ diff --git a/src/Tools/YamsPlug/doc/Makefile.am b/src/Tools/YamsPlug/doc/Makefile.am index 9a9056a90..e498dbb25 100644 --- a/src/Tools/YamsPlug/doc/Makefile.am +++ b/src/Tools/YamsPlug/doc/Makefile.am @@ -11,11 +11,12 @@ SOURCEDIR = $(srcdir) SPHINXBUILD = sphinx-build PAPER = BUILDDIR = _build +CONF_FILE_DIR = . # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCEDIR) +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees -c $(CONF_FILE_DIR) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCEDIR) .PHONY: help clean html latexpdf diff --git a/src/Tools/YamsPlug/doc/conf.py b/src/Tools/YamsPlug/doc/conf.py.in similarity index 98% rename from src/Tools/YamsPlug/doc/conf.py rename to src/Tools/YamsPlug/doc/conf.py.in index e3d577630..6f0e3636c 100644 --- a/src/Tools/YamsPlug/doc/conf.py +++ b/src/Tools/YamsPlug/doc/conf.py.in @@ -35,16 +35,16 @@ source_suffix = '.rst' master_doc = 'index' # General substitutions. -project = 'YAMS Plug_in' +project = 'YAMS Plug-in' copyright = '2011, Pascale Noyret' # The default replacements for |version| and |release|, also used in various # other places throughout the built documents. # # The short X.Y version. -version = '6.4' +version = '@VERSION@' # The full version, including alpha/beta/rc tags. -release = '6.4.0' +release = '@VERSION@' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: -- 2.39.2