doc: use DOCUMENT_VERSION* to pass version information to Sphinx

mroonga · May 30, 2012 · b4b05aa · b4b05aa
1 parent 9772757
commit b4b05aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build/makefiles/sphinx-build.am b/build/makefiles/sphinx-build.am
@@ -13,8 +13,8 @@ ALLSPHINXOPTS   = $(PAPEROPT_$(PAPER)) -E $(SPHINXOPTS) $(SOURCE_DIR)
 SPHINX_DIR = $(abs_top_builddir)/doc/sphinx
 SPHINX_BUILD = $(SPHINX_DIR)/sphinx-build.py
 SPHINX_BUILD_COMMAND =				\
-	VERSION="$(DOCUMENT_VERSION)"		\
-	VERSION_FULL="$(DOCUMENT_VERSION_FULL)"	\
+	DOCUMENT_VERSION="$(DOCUMENT_VERSION)"		\
+	DOCUMENT_VERSION_FULL="$(DOCUMENT_VERSION_FULL)"	\
 	LOCALE="$(LOCALE)"			\
 	PYTHONPATH="$(SPHINX_DIR):$$PYTHONPATH"	\
 	python $(SPHINX_BUILD)

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -49,9 +49,9 @@
 # built documents.
 
 # The short X.Y version.
-version = os.environ["VERSION"]
+version = os.environ["DOCUMENT_VERSION"]
 # The full version, including alpha/beta/rc tags.
-release = version
+release = os.environ["DOCUMENT_VERSION_FULL"]
 
 # The directories that has *.mo files.
 locale_dirs = ["../locale"]