diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-01-15 16:40:12 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-01-15 16:40:12 +0000 |
| commit | c1a412f318735a32248dc1964bd38f98e4836cfa (patch) | |
| tree | 56b32250aee7c6ba9d6c638f07975a3126f38dc5 /eclass | |
| parent | Removing PHP 5.2 only ebuilds/packages (diff) | |
| download | gentoo-2-c1a412f318735a32248dc1964bd38f98e4836cfa.tar.gz gentoo-2-c1a412f318735a32248dc1964bd38f98e4836cfa.tar.bz2 gentoo-2-c1a412f318735a32248dc1964bd38f98e4836cfa.zip | |
Improve the --docdir configure grep.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/autotools-utils.eclass | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index e92db66ad013..4c86957f091f 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.87 2012/01/15 14:13:46 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.88 2012/01/15 16:40:12 mgorny Exp $ + + 15 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: + Improve the --docdir configure grep. 15 Jan 2012; Ulrich Müller <ulm@gentoo.org> cdrom.eclass: New variable CDROM_DISABLE_PROPERTIES. Set PROPERTIES only if this is unset. diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index e7b617ab70da..d14061d8be62 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.41 2012/01/15 14:05:14 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.42 2012/01/15 16:40:12 mgorny Exp $ # @ECLASS: autotools-utils.eclass # @MAINTAINER: @@ -398,7 +398,7 @@ autotools-utils_src_configure() { local econfargs=() _check_build_dir - if "${ECONF_SOURCE}"/configure --help 2>&1 | grep docdir; then + if "${ECONF_SOURCE}"/configure --help 2>&1 | grep '^ *--docdir='; then econfargs+=( --docdir="${EPREFIX}"/usr/share/doc/${PF} ) |