diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-05-04 20:06:42 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-05-04 20:06:42 +0000 |
| commit | eaaf4e173318d44d42f48960105c13ee09ae076f (patch) | |
| tree | 3523823d95baff7a869901d9ecbb95dd50d956c2 /eclass | |
| parent | EAPI5 bump and some minor fixes. Details on bug #448578 (diff) | |
| download | gentoo-2-eaaf4e173318d44d42f48960105c13ee09ae076f.tar.gz gentoo-2-eaaf4e173318d44d42f48960105c13ee09ae076f.tar.bz2 gentoo-2-eaaf4e173318d44d42f48960105c13ee09ae076f.zip | |
improve handling of DOCS variable wrt #468092
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/multilib-minimal.eclass | 23 |
2 files changed, 25 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 69123f95c055..40fa64e1e396 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.811 2013/05/03 09:20:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.812 2013/05/04 20:06:42 hasufell Exp $ + + 04 May 2013; Julian Ospald <hasufell@gentoo.org> multilib-minimal.eclass: + improve handling of DOCS variable wrt #468092 03 May 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: Support disabling .la pruning completely. diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index 0a5aab9b197f..c2407d38a815 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.2 2013/04/07 16:56:14 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.3 2013/05/04 20:06:42 hasufell Exp $ # @ECLASS: multilib-minimal.eclass # @MAINTAINER: @@ -84,7 +84,13 @@ multilib-minimal_src_install() { if declare -f multilib_src_install >/dev/null ; then multilib_src_install else - default_src_install + # default_src_install will not work here as it will + # break handling of DOCS wrt #468092 + # so we split up the emake and doc-install part + # this is synced with __eapi4_src_install + if [[ -f Makefile || -f GNUmakefile || -f makefile ]] ; then + emake DESTDIR="${D}" install + fi fi multilib_prepare_wrappers multilib_check_headers @@ -96,4 +102,17 @@ 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} + fi } |