aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjenkins4kodi <jenkins4kodi@users.noreply.github.com>2016-12-13 22:42:07 +0100
committerGitHub <noreply@github.com>2016-12-13 22:42:07 +0100
commitad7b27a47218c7580396d4d8c91622f92ef26de4 (patch)
tree703b0e4f8d42d79e23759f29e38872789e1deb05
parent27babda79efe7e9df76d432e98853e5eeb2fc458 (diff)
parent11402c0dcd8922b8c4344794520c42bd60c264b9 (diff)
Merge pull request #11166 from cjmayo/backport_11151
-rw-r--r--project/cmake/scripts/linux/Install.cmake2
-rw-r--r--project/cmake/scripts/linux/PathSetup.cmake1
2 files changed, 2 insertions, 1 deletions
diff --git a/project/cmake/scripts/linux/Install.cmake b/project/cmake/scripts/linux/Install.cmake
index d8df3598d9..adf428db44 100644
--- a/project/cmake/scripts/linux/Install.cmake
+++ b/project/cmake/scripts/linux/Install.cmake
@@ -129,7 +129,7 @@ install(FILES ${CORE_SOURCE_DIR}/copying.txt
${CORE_SOURCE_DIR}/LICENSE.GPL
${CORE_SOURCE_DIR}/version.txt
${CORE_SOURCE_DIR}/docs/README.linux
- DESTINATION ${datarootdir}/doc/${APP_NAME_LC}
+ DESTINATION ${docdir}
COMPONENT kodi)
install(FILES ${CORE_SOURCE_DIR}/privacy-policy.txt
diff --git a/project/cmake/scripts/linux/PathSetup.cmake b/project/cmake/scripts/linux/PathSetup.cmake
index f69711e578..5532c2d962 100644
--- a/project/cmake/scripts/linux/PathSetup.cmake
+++ b/project/cmake/scripts/linux/PathSetup.cmake
@@ -34,6 +34,7 @@ list(APPEND final_message "Bindir: ${bindir}")
list(APPEND final_message "Includedir: ${includedir}")
list(APPEND final_message "Datarootdir: ${datarootdir}")
list(APPEND final_message "Datadir: ${datadir}")
+list(APPEND final_message "Docdir: ${docdir}")
set(PATH_DEFINES -DBIN_INSTALL_PATH=\"${libdir}/kodi\"
-DINSTALL_PATH=\"${datarootdir}/kodi\")