diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-02-11 21:14:20 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-02-11 21:14:20 +0000 |
| commit | b1d3544bf43605858728f5c4f9b7ff62a7b21190 (patch) | |
| tree | b2dadc275a1d38fa1623278f1771e9ded3d24751 /eclass | |
| parent | libgnomecanvas is needed (#500938 by John J. Aylward) (diff) | |
| download | gentoo-2-b1d3544bf43605858728f5c4f9b7ff62a7b21190.tar.gz gentoo-2-b1d3544bf43605858728f5c4f9b7ff62a7b21190.tar.bz2 gentoo-2-b1d3544bf43605858728f5c4f9b7ff62a7b21190.zip | |
Pass --docdir with proper directory, bug #482646
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/gnome2.eclass | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index de707d54188f..2990869f2d03 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1141 2014/02/11 19:00:06 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1142 2014/02/11 21:14:20 pacho Exp $ + + 11 Feb 2014; Pacho Ramos <pacho@gentoo.org> gnome2.eclass: + Pass --docdir with proper directory, bug #482646 11 Feb 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-package.eclass, haskell-cabal.eclass: diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 40b536e501ef..ec6832a17bb4 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.124 2013/09/29 08:49:53 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.125 2014/02/11 21:14:20 pacho Exp $ # @ECLASS: gnome2.eclass # @MAINTAINER: @@ -163,6 +163,11 @@ gnome2_src_configure() { G2CONF="--enable-compile-warnings=minimum ${G2CONF}" fi + # Pass --docdir with proper directory, bug #482646 + if grep -q "^ *--docdir=" "${ECONF_SOURCE:-.}"/configure; then + G2CONF="--docdir="${EPREFIX}"/usr/share/doc/${PF} ${G2CONF}" + fi + # Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) addwrite "$(unset HOME; echo ~)/.gnome2" |