Simplified paths

doc/CMakeLists.txt

@@ -27,7 +27,7 @@ set(_SPHINX_CONF_SUBST_DICT PROMOD3_VERSION_MAJOR="${PROMOD3_VERSION_MAJOR}"
                             PROMOD3_VERSION_PATCH="${PROMOD3_VERSION_PATCH}"
                             PYTHON_DOC_URL="${PYTHON_DOC_URL}"
                             LIB_STAGE_PATH="${LIB_STAGE_PATH}"
-                            PYTHON_VERSION="${PYTHON_VERSION}"
+                            PYTHON_MODULE_PATH="${PYTHON_MODULE_PATH}"
                             OST_PYMOD_PATH="${OST_PYMOD_PATH}"
                             OST_DOC_URL="${OST_DOC_URL}"
                             LIB_DIR="${LIB_DIR}")

doc/conf.py.in

@@ -19,7 +19,7 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, '@LIB_STAGE_PATH@/python@PYTHON_VERSION@/site-packages')
+sys.path.insert(0, '@LIB_STAGE_PATH@/@PYTHON_MODULE_PATH@')
 sys.path.insert(1, '@OST_PYMOD_PATH@')
 
 # -- General configuration -----------------------------------------------------
@@ -281,7 +281,7 @@ rst_epilog = """
 # in some versions of sphinx, doctest invokes doctest_path AFTER executing code
 doctest_global_setup = """
 import sys
-sys.path.insert(0, '@LIB_STAGE_PATH@/python@PYTHON_VERSION@/site-packages')
+sys.path.insert(0, '@LIB_STAGE_PATH@/@PYTHON_MODULE_PATH@')
 sys.path.insert(1, '@OST_PYMOD_PATH@')
 
 import ost