[gentoo-commits] dev/mgorny:master commit in: eclass/

["Michał Górny" <mgorny@gentoo.org>]

commit:     d26b8b1ed6938af622c6041fdda3a98b518448e7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 10:07:23 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 10:07:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=d26b8b1e

Fix passing temporary --docdir to packages.

Rather install in the actual docdir, and move forth and back whenever
necessary.

---
 eclass/autotools-utils.eclass |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 1b19ed2..fcdf219 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -392,9 +392,11 @@ autotools-utils_src_configure() {
 	[[ -z ${myeconfargs+1} || $(declare -p myeconfargs) == 'declare -a'* ]] \
 		|| die 'autotools-utils.eclass: myeconfargs has to be an array.'
 
+	[[ ${EAPI} == 2 ]] && ! use prefix && EPREFIX=
+
 	# Common args
 	local econfargs=(
-		--docdir=/temporary-docdir
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 	)
 
 	# Handle static-libs found in IUSE, disable them by default
@@ -443,6 +445,24 @@ autotools-utils_src_install() {
 	emake DESTDIR="${D}" "$@" install || die "emake install failed"
 	popd > /dev/null
 
+	# Move docs installed by autotools (in EAPI < 4).
+	if [[ -d ${D}${EPREFIX}/usr/share/doc/${PF} ]]; then
+		if [[ ${EAPI} == [23] ]]; then
+			mkdir "${T}"/temp-docdir
+			mv "${D}${EPREFIX}"/usr/share/doc/${PF}/* "${T}"/temp-docdir/ \
+				|| die "moving docs to tempdir failed"
+
+			local f
+			for f in "${T}"/temp-docdir/*; do
+				[[ -d ${f} ]] \
+					&& die "directories in docdir require at least EAPI 4"
+			done
+
+			dodoc "${T}"/temp-docdir/* || die "docdir dodoc failed"
+			rm -r "${T}"/temp-docdir || die
+		fi
+	fi
+
 	# XXX: support installing them from builddir as well?
 	if [[ ${DOCS} ]]; then
 		dodoc "${DOCS[@]}" || die "dodoc failed"
@@ -460,23 +480,6 @@ 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
 }