diff options
Diffstat (limited to 'app-office/scribus/files/scribus-9999-docdir.patch')
-rw-r--r-- | app-office/scribus/files/scribus-9999-docdir.patch | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/app-office/scribus/files/scribus-9999-docdir.patch b/app-office/scribus/files/scribus-9999-docdir.patch index 442829d3bda9..d866922fa18a 100644 --- a/app-office/scribus/files/scribus-9999-docdir.patch +++ b/app-office/scribus/files/scribus-9999-docdir.patch @@ -1,8 +1,11 @@ + CMakeLists.txt | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) + diff --git a/CMakeLists.txt b/CMakeLists.txt -index 79b1feb..259d474 100644 +index 29d66f3..1c08cdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -284,16 +284,18 @@ else() +@@ -244,19 +244,21 @@ else() endif() #SHARE - use the default on Apple as TAG_VERSION is empty @@ -11,21 +14,29 @@ index 79b1feb..259d474 100644 -else() - if(TAG_VERSION OR BUILD_OSX_BUNDLE) - set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") +- else() +- if(NOT WANT_VERSIONING) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") +- else() +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") +- endif() +- endif() +-endif() +if(NOT DOCDIR) + if(WIN32 OR OS2) + set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") - else() -- if(NOT WANT_VERSIONING) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") ++ else() + if(TAG_VERSION OR BUILD_OSX_BUNDLE) + set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") - else() -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") ++ else() + if(NOT WANT_VERSIONING) + set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") + else() + set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") + endif() - endif() - endif() - endif() ++ endif() ++ endif() ++endif() + if(NOT IS_ABSOLUTE ${DOCDIR}) + add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") + else() |