diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-12-14 08:40:18 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-12-14 08:40:18 +0000 |
| commit | 50c272ebee73e00265ffdf320b7df25edb2ace00 (patch) | |
| tree | f10a598b05d7d8f61760c9408fe1a414c3d2b1f4 /eclass | |
| parent | media-gfx/argyllcms: Drop vulnerable version, #437652 (diff) | |
| download | gentoo-2-50c272ebee73e00265ffdf320b7df25edb2ace00.tar.gz gentoo-2-50c272ebee73e00265ffdf320b7df25edb2ace00.tar.bz2 gentoo-2-50c272ebee73e00265ffdf320b7df25edb2ace00.zip | |
Support directories in DOCS, in EAPI 4+.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/autotools-utils.eclass | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index cc033f654917..d86a1a9b9b61 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.558 2012/12/13 16:47:25 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.559 2012/12/14 08:40:18 mgorny Exp $ + + 14 Dec 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: + Support directories in DOCS, in EAPI 4+. 13 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: Add (temporary) fix for sandbox failures when compiling Python modules. Bug diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index 7bdc5d6db999..c952de5ae6ec 100644 --- a/eclass/autotools-utils.eclass +++ b/eclass/autotools-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.60 2012/12/03 12:05:51 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.61 2012/12/14 08:40:18 mgorny Exp $ # @ECLASS: autotools-utils.eclass # @MAINTAINER: @@ -157,6 +157,8 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test # @DESCRIPTION: # Array containing documents passed to dodoc command. # +# In EAPIs 4+, can list directories as well. +# # Example: # @CODE # DOCS=( NEWS README ) @@ -485,7 +487,12 @@ autotools-utils_src_install() { # XXX: support installing them from builddir as well? if [[ ${DOCS} ]]; then - dodoc "${DOCS[@]}" || die "dodoc failed" + if [[ ${EAPI} == [23] ]]; then + dodoc "${DOCS[@]}" || die + else + # dies by itself + dodoc -r "${DOCS[@]}" + fi else local f # same list as in PMS |