From ec9bd25bec88fd441d46b3d3bcdf71a61e2bd151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 6 Jan 2012 16:32:13 +0100 Subject: [PATCH] Pass --docdir to configure, and install docs from it. As EAPI 2 support is intended, this requires configuring the build system to install docs into a temporary location and moving files from it. Due to the lack of 'dodoc -r', directories inside docdir are supported only with EAPI 4. Fixes: https://bugs.gentoo.org/show_bug.cgi?id=350423 --- eclass/autotools-utils.eclass | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index 9a13a3a..1b19ed2 100644 --- a/eclass/autotools-utils.eclass +++ b/eclass/autotools-utils.eclass @@ -393,7 +393,9 @@ autotools-utils_src_configure() { || die 'autotools-utils.eclass: myeconfargs has to be an array.' # Common args - local econfargs=() + local econfargs=( + --docdir=/temporary-docdir + ) # Handle static-libs found in IUSE, disable them by default if in_iuse static-libs; then @@ -458,6 +460,23 @@ autotools-utils_src_install() { dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed" fi + # Move docs installed by autotools. + if [[ -d ${D}/temporary-docdir ]]; then + if [[ ${EAPI} = 4 ]]; then + dodoc -r "${D}"/temporary-docdir/* || die "docdir dodoc failed" + else + local f + for f in "${D}"/temporary-docdir/*; do + [[ -d ${f} ]] \ + && die "directories in docdir require at least EAPI 4" + done + + dodoc "${D}"/temporary-docdir/* || die "docdir dodoc failed" + fi + + rm -r "${D}"/temporary-docdir + fi + # Remove libtool files and unnecessary static libs remove_libtool_files } -- 1.7.8.2