diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-01-15 14:05:14 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-01-15 14:05:14 +0000 |
| commit | 0a4c64a6b91c54bdb948cb2f6084283b2e146bbb (patch) | |
| tree | dda2bedba7d830ac44d205e3f9be4523e5662854 /eclass | |
| parent | Empty py-compile script instead of symlinking it to /path/to/true for automak... (diff) | |
| download | gentoo-2-0a4c64a6b91c54bdb948cb2f6084283b2e146bbb.tar.gz gentoo-2-0a4c64a6b91c54bdb948cb2f6084283b2e146bbb.tar.bz2 gentoo-2-0a4c64a6b91c54bdb948cb2f6084283b2e146bbb.zip | |
Pass --docdir to configure only when supported.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/autotools-utils.eclass | 14 |
2 files changed, 13 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d7bd2e872ad3..99dc57058c07 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.85 2012/01/14 18:53:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.86 2012/01/15 14:05:14 mgorny Exp $ + + 15 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: + Pass --docdir to configure only when supported. 14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: Use path_exists() to ensure any file exists in docdir. diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index b59d927e3b09..e7b617ab70da 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.40 2012/01/14 18:53:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.41 2012/01/15 14:05:14 mgorny Exp $ # @ECLASS: autotools-utils.eclass # @MAINTAINER: @@ -395,9 +395,14 @@ autotools-utils_src_configure() { [[ ${EAPI} == 2 ]] && ! use prefix && EPREFIX= # Common args - local econfargs=( - --docdir="${EPREFIX}/usr/share/doc/${PF}" - ) + local econfargs=() + + _check_build_dir + if "${ECONF_SOURCE}"/configure --help 2>&1 | grep docdir; then + econfargs+=( + --docdir="${EPREFIX}"/usr/share/doc/${PF} + ) + fi # Handle static-libs found in IUSE, disable them by default if in_iuse static-libs; then @@ -410,7 +415,6 @@ autotools-utils_src_configure() { # Append user args econfargs+=("${myeconfargs[@]}") - _check_build_dir mkdir -p "${AUTOTOOLS_BUILD_DIR}" || die "mkdir '${AUTOTOOLS_BUILD_DIR}' failed" pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null econf "${econfargs[@]}" "$@" |