@@ -, +, @@ --- eclass/autotools-utils.eclass | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) --- a/eclass/autotools-utils.eclass +++ a/eclass/autotools-utils.eclass @@ -377,7 +377,12 @@ autotools-utils_src_configure() { || die 'autotools-utils.eclass: myeconfargs has to be an array.' # Common args - local econfargs=() + local econfargs=( +# for EAPI >= 4, we could: +# --docdir="${EPREFIX}"/usr/share/doc/${PF} +# for all EAPIs, it's simpler to: + --docdir=/tmp/temporary-docdir + ) # Handle static-libs found in IUSE, disable them by default if in_iuse static-libs; then @@ -442,6 +447,23 @@ autotools-utils_src_install() { dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed" fi + # Move docs installed by autotools. + if [[ -d ${D}/tmp/temporary-docdir ]]; then + if [[ ${EAPI} = 4 ]]; then + dodoc -r "${D}"/tmp/temporary-docdir/* || die "docdir dodoc failed" + else + local f + for f in "${D}"/tmp/temporary-docdir/*; do + [[ -d ${f} ]] \ + && die "directories in docdir require at least EAPI 4" + done + + dodoc "${D}"/tmp/temporary-docdir/* || die "docdir dodoc failed" + fi + + rm -r "${D}"/tmp/temporary-docdir + fi + # Remove libtool files and unnecessary static libs remove_libtool_files } --