diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-02-11 09:46:07 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-02-11 09:46:07 +0000 |
| commit | 2f669239ae7227db950e5e1e01107686d9242ce6 (patch) | |
| tree | 8ff7bb343445445dcbf20daeff67df13114515ff /eclass | |
| parent | Depend on cairo[-qt4] if gtkstyle is enabled, wrt bug 454066. Remove dead cod... (diff) | |
| download | gentoo-2-2f669239ae7227db950e5e1e01107686d9242ce6.tar.gz gentoo-2-2f669239ae7227db950e5e1e01107686d9242ce6.tar.bz2 gentoo-2-2f669239ae7227db950e5e1e01107686d9242ce6.zip | |
Support DOCS=() to disable installing documentation.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/autotools-utils.eclass | 19 | ||||
| -rw-r--r-- | eclass/distutils-r1.eclass | 7 |
2 files changed, 16 insertions, 10 deletions
diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index c952de5ae6ec..2f9c18161487 100644 --- a/eclass/autotools-utils.eclass +++ b/eclass/autotools-utils.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.61 2012/12/14 08:40:18 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.62 2013/02/11 09:46:07 mgorny Exp $ # @ECLASS: autotools-utils.eclass # @MAINTAINER: @@ -486,12 +486,15 @@ autotools-utils_src_install() { fi # XXX: support installing them from builddir as well? - if [[ ${DOCS} ]]; then - if [[ ${EAPI} == [23] ]]; then - dodoc "${DOCS[@]}" || die - else - # dies by itself - dodoc -r "${DOCS[@]}" + if declare -p DOCS &>/dev/null; then + # an empty list == don't install anything + if [[ ${DOCS[@]} ]]; then + if [[ ${EAPI} == [23] ]]; then + dodoc "${DOCS[@]}" || die + else + # dies by itself + dodoc -r "${DOCS[@]}" + fi fi else local f diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 4a701df9b032..e662fa24af90 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.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/distutils-r1.eclass,v 1.52 2013/02/10 16:15:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.53 2013/02/11 09:46:07 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -485,7 +485,10 @@ distutils-r1_python_install_all() { debug-print-function ${FUNCNAME} "${@}" if declare -p DOCS &>/dev/null; then - dodoc -r "${DOCS[@]}" || die "dodoc failed" + # an empty list == don't install anything + if [[ ${DOCS[@]} ]]; then + dodoc -r "${DOCS[@]}" || die "dodoc failed" + fi else local f # same list as in PMS |