From: Michał Górny Date: Thu, 29 Mar 2018 19:05:54 +0000 (+0200) Subject: cmake-utils.eclass: Override CMAKE_INSTALL_DOCDIR in EAPI 7 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=da2f96d0b25ce88035f1442c965ac64c95994bd8;p=gentoo.git cmake-utils.eclass: Override CMAKE_INSTALL_DOCDIR in EAPI 7 Pass the correct docdir for GNUInstallDirs in EAPIs starting with 7. We do not need add it retroactively to avoid breaking something accidentally. --- diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 558ff3a1ef9b..e64502b3b9b0 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -614,6 +614,12 @@ cmake-utils_src_configure() { _EOF_ [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" + if [[ ${EAPI} != [56] ]]; then + cat >> "${common_config}" <<- _EOF_ || die + SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "") + _EOF_ + fi + # Wipe the default optimization flags out of CMake if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then cat >> ${common_config} <<- _EOF_ || die