From: Zbigniew Jędrzejewski-Szmek Date: Fri, 8 Mar 2013 16:45:37 +0000 (-0500) Subject: systemd-python: provide version info to sphinx X-Git-Tag: v199~242 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9f06e912f6a0db45c80d41e94eea65caae7a7c90;ds=sidebyside systemd-python: provide version info to sphinx --- diff --git a/Makefile.am b/Makefile.am index bea545259..7b1f17f65 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3551,7 +3551,7 @@ BUILT_SOURCES += \ src/python-systemd/id128-constants.h PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4) -SPHINXOPTS = -D latex_paper_size=$(PAPER) +SPHINXOPTS = -D latex_paper_size=$(PAPER) -D version=$(VERSION) -D release=$(VERSION) sphinx-%: $(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; } $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/ diff --git a/src/python-systemd/docs/conf.py b/src/python-systemd/docs/conf.py index 4a55778b7..ad3f0023c 100644 --- a/src/python-systemd/docs/conf.py +++ b/src/python-systemd/docs/conf.py @@ -42,15 +42,6 @@ master_doc = 'index' # General information about the project. project = u'python-systemd' -# 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 = '197' -# The full version, including alpha/beta/rc tags. -release = '197' - # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. #language = None