diff options
| author | Christian Heimes <cheimes@redhat.com> | 2016-03-01 11:08:59 +0100 |
|---|---|---|
| committer | Christian Heimes <cheimes@redhat.com> | 2016-03-01 19:05:43 +0100 |
| commit | 298e15c16e266d2ca81e62354edb9dc5626c1f72 (patch) | |
| tree | ea30117af6aa92d13ff7188451de933c0a030e1a /base/common/python | |
| parent | 49e4fffe1681de5a5fb21de62cd4b7ed9505fc7a (diff) | |
| download | pki-298e15c16e266d2ca81e62354edb9dc5626c1f72.tar.gz pki-298e15c16e266d2ca81e62354edb9dc5626c1f72.tar.xz pki-298e15c16e266d2ca81e62354edb9dc5626c1f72.zip | |
Use CMAKE_CURRENT_SOURCE_DIR for sphinx-build
sphinx-build used wrong search path for pki Python package. This caused
builds to fail on some machines. On systems with pki-base installed,
sphinx-build picked up the wrong files.
Diffstat (limited to 'base/common/python')
| -rw-r--r-- | base/common/python/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | base/common/python/conf.py | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/base/common/python/CMakeLists.txt b/base/common/python/CMakeLists.txt index d667421bf..a16459775 100644 --- a/base/common/python/CMakeLists.txt +++ b/base/common/python/CMakeLists.txt @@ -16,23 +16,27 @@ configure_file( add_custom_target(dogtag_python_client_docs ALL ${SPHINX_EXECUTABLE} -b html - -c "${CMAKE_CURRENT_BINARY_DIR}" + -c "${CMAKE_CURRENT_SOURCE_DIR}" -w "${CMAKE_CURRENT_BINARY_DIR}/python-client-lib-html.log" -a -W "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/html" + WORKING_DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Building Python Client Library HTML documentation") add_custom_target(dogtag_python_client_man_docs ALL ${SPHINX_EXECUTABLE} -b man - -c "${CMAKE_CURRENT_BINARY_DIR}" + -c "${CMAKE_CURRENT_SOURCE_DIR}" -w "${CMAKE_CURRENT_BINARY_DIR}/python-client-lib-man.log" -a -W "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/man" + WORKING_DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Building Python Client Library manual pages") install( diff --git a/base/common/python/conf.py b/base/common/python/conf.py index 3e548147e..f996c6371 100644 --- a/base/common/python/conf.py +++ b/base/common/python/conf.py @@ -19,7 +19,8 @@ import sphinx # 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, os.path.abspath('pki')) +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) + # -- General configuration ----------------------------------------------- |