From 60efef3b42a754c06d2050f6d5f3fbaf7ddeaf18 Mon Sep 17 00:00:00 2001
From: Stefan Bienert <stefan.bienert@unibas.ch>
Date: Mon, 17 Nov 2014 15:55:59 +0100
Subject: [PATCH] Simplified paths
---
doc/CMakeLists.txt | 2 +-
doc/conf.py.in | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index b921f03c..57a1d364 100644
--- a/doc/CMakeLists.txt
+++ b/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}")
diff --git a/doc/conf.py.in b/doc/conf.py.in
index 2c10a2e6..7ca3836a 100644
--- a/doc/conf.py.in
+++ b/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
--
GitLab