diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-10-20 16:27:24 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-10-20 16:27:24 +0000 |
| commit | 2817daa275188f5214e8492d8150426df9e699c7 (patch) | |
| tree | ae5c6ab6c76378cc7f91cebce946b0466714c1d3 | |
| parent | Initial import (diff) | |
| download | historical-2817daa275188f5214e8492d8150426df9e699c7.tar.gz historical-2817daa275188f5214e8492d8150426df9e699c7.tar.bz2 historical-2817daa275188f5214e8492d8150426df9e699c7.zip | |
make doc installation part of default multilib_src_install_all() wrt #483304
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/multilib-minimal.eclass | 17 |
2 files changed, 7 insertions, 15 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0566f52a0042..24a1e0640256 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1027 2013/10/17 22:53:59 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1028 2013/10/20 16:27:24 hasufell Exp $ + + 20 Oct 2013; Julian Ospald <hasufell@gentoo.org> multilib-minimal.eclass: + make doc installation part of default multilib_src_install_all() wrt #483304 17 Oct 2013; Christoph Junghans <ottxor@gentoo.org> subversion.eclass: added prefix support (bug #485534) diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index d4c3cbd07f1e..72a2cb76d028 100644 --- a/eclass/multilib-minimal.eclass +++ b/eclass/multilib-minimal.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.5 2013/06/28 12:42:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.6 2013/10/20 16:27:24 hasufell Exp $ # @ECLASS: multilib-minimal.eclass # @MAINTAINER: @@ -30,7 +30,7 @@ case ${EAPI:-0} in esac -inherit multilib-build +inherit eutils multilib-build EXPORT_FUNCTIONS src_configure src_compile src_test src_install @@ -104,18 +104,7 @@ multilib-minimal_src_install() { if declare -f multilib_src_install_all >/dev/null ; then multilib_src_install_all - fi - - # this is synced with __eapi4_src_install - if ! declare -p DOCS &>/dev/null ; then - local d - for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \ - THANKS BUGS FAQ CREDITS CHANGELOG ; do - [[ -s "${d}" ]] && dodoc "${d}" - done - elif [[ $(declare -p DOCS) == "declare -a "* ]] ; then - dodoc "${DOCS[@]}" else - dodoc ${DOCS} + einstalldocs fi } |