diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-19 19:27:08 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-12-03 22:37:00 +0100 |
| commit | 73dd987280fb078a08fe12a1572bdf9f9a5e09ea (patch) | |
| tree | 8f7933f9edd0bf820d86b9bb577f7515d61cb7cd | |
| parent | 9e955f0a540ebe8763dd03dfec0fa40e9e2761a6 (diff) | |
| download | ptxdist-73dd987280fb078a08fe12a1572bdf9f9a5e09ea.tar.gz ptxdist-73dd987280fb078a08fe12a1572bdf9f9a5e09ea.tar.xz | |
docs: extract ptxdist version when building the documentation
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | doc/conf.py (renamed from doc/conf.py.in) | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index d94d3fab8..7ca79d3b6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -136,4 +136,7 @@ release: SPHINXBUILD = @SPHINX@ docs: - @$(SPHINXBUILD) -b html -d ./Documentation ./doc ./Documentation/html + @. scripts/ptxdist_version.sh && \ + export PTXDIST_VERSION_FULL && \ + export PTXDIST_VERSION="$${PTXDIST_VERSION_YEAR}.$${PTXDIST_VERSION_MONTH}.$${PTXDIST_VERSION_BUGFIX}" && \ + $(SPHINXBUILD) -b html -d ./Documentation ./doc ./Documentation/html diff --git a/configure.ac b/configure.ac index 640974a42..ffa8b3e9f 100644 --- a/configure.ac +++ b/configure.ac @@ -394,7 +394,6 @@ AC_SUBST(PACKAGE_VERSION) AC_MSG_RESULT([]) AC_CONFIG_FILES( \ Makefile \ - doc/conf.py ) AC_OUTPUT AC_MSG_RESULT([]) diff --git a/doc/conf.py.in b/doc/conf.py index 3e6b2b4fb..33ccfe36f 100644 --- a/doc/conf.py.in +++ b/doc/conf.py @@ -53,9 +53,9 @@ copyright = u'2015, The Pengutronix Development Team' # The short X.Y version. import os -version = "@PACKAGE_VERSION@" +version = os.getenv("PTXDIST_VERSION_FULL") # The full version, including alpha/beta/rc tags. -release = "@PACKAGE_VERSION@" +release = version # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -113,9 +113,9 @@ rst_epilog = """ .. |ptxdistPlatformName| replace:: arm-qemu .. |ptxdistPlatformVariant| replace:: \ .. |ptxdistPlatformCollection| replace:: \ -.. |ptxdistVendorVersion| replace:: 2015.03.0 +.. |ptxdistVendorVersion| replace:: %s .. |package| replace:: <pagage> -""" +""" % os.getenv("PTXDIST_VERSION") # -- Options for HTML output ---------------------------------------------- |