diff options
author | Michał Górny <mgorny@gentoo.org> | 2012-01-14 18:53:56 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2012-01-14 18:53:56 +0000 |
commit | b5e5cf709cf049655f25a1003305b65dedc3d3a9 (patch) | |
tree | 8b355d62265a8006ae4991a17281be03c075da0e /eclass | |
parent | Empty the py-compile script instead of symlinking it for compability with aut... (diff) | |
download | gentoo-2-b5e5cf709cf049655f25a1003305b65dedc3d3a9.tar.gz gentoo-2-b5e5cf709cf049655f25a1003305b65dedc3d3a9.tar.bz2 gentoo-2-b5e5cf709cf049655f25a1003305b65dedc3d3a9.zip |
Use path_exists() to ensure any file exists in docdir.
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/ChangeLog | 5 | ||||
-rw-r--r-- | eclass/autotools-utils.eclass | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 435606e592a8..d7bd2e872ad3 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.84 2012/01/14 18:14:39 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.85 2012/01/14 18:53:56 mgorny Exp $ + + 14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: + Use path_exists() to ensure any file exists in docdir. 14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: Replace the docdir-directory error with a warning. diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index 2239b55d0f32..b59d927e3b09 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.39 2012/01/14 18:14:39 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.40 2012/01/14 18:53:56 mgorny Exp $ # @ECLASS: autotools-utils.eclass # @MAINTAINER: @@ -446,7 +446,8 @@ autotools-utils_src_install() { popd > /dev/null # Move docs installed by autotools (in EAPI < 4). - if [[ ${EAPI} == [23] && -d ${D}${EPREFIX}/usr/share/doc/${PF} ]]; then + if [[ ${EAPI} == [23] ]] \ + && path_exists "${D}${EPREFIX}"/usr/share/doc/${PF}/*; then if [[ $(find "${D}${EPREFIX}"/usr/share/doc/${PF}/* -type d) ]]; then eqawarn "autotools-utils: directories in docdir require at least EAPI 4" else |