diff options
| author |   Leonardo Boshell <leonardop@gentoo.org> | 2005-07-01 20:35:31 +0000 |
|---|---|---|
| committer | Leonardo Boshell <leonardop@gentoo.org> | 2005-07-01 20:35:31 +0000 |
| commit | 44a7bb29439f6672a65afbe16c06882b7f2eb814 (patch) | |
| tree | 02a654ba9105f67ade78280c07cde10c618d52dc /eclass/gnome2.eclass | |
| parent | a bsd license with advertising clause (non-free software) (diff) | |
| download | gentoo-2-44a7bb29439f6672a65afbe16c06882b7f2eb814.tar.gz gentoo-2-44a7bb29439f6672a65afbe16c06882b7f2eb814.tar.bz2 gentoo-2-44a7bb29439f6672a65afbe16c06882b7f2eb814.zip | |
* (gnome2_src_configure):
Simplifying syntax for 'doc' USE flag support
* (gnome2_gconf_install):
Simplifying syntax.
Verify that the schemas files exist before processing them.
Diffstat (limited to 'eclass/gnome2.eclass')
| -rw-r--r-- | eclass/gnome2.eclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 049f5edd154b..e2ec8f423dd0 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.48 2005/06/05 16:33:18 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.49 2005/07/01 20:35:31 leonardop Exp $ # # Authors: # Bruce A. Locke <blocke@shivan.org> @@ -27,9 +27,7 @@ gnome2_src_configure() { elibtoolize ${ELTCONF} # doc keyword for gtk-doc - use doc \ - && G2CONF="${G2CONF} --enable-gtk-doc" \ - || G2CONF="${G2CONF} --disable-gtk-doc" + G2CONF="${G2CONF} $(use_enable doc gtk-doc)" econf "$@" ${G2CONF} || die "./configure failure" @@ -87,9 +85,11 @@ gnome2_gconf_install() { unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL export GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source` einfo "Installing GNOME 2 GConf schemas" - cat ${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS | grep "obj /etc/gconf/schemas" | sed 's:obj \([^ ]*\) .*:\1:' |while read F; do - # echo "DEBUG::gconf install ${F}" - ${ROOT}/usr/bin/gconftool-2 --makefile-install-rule ${F} 1>/dev/null + grep "obj /etc/gconf/schemas" ${ROOT}/var/db/pkg/*/${PF}/CONTENTS | sed 's:obj \([^ ]*\) .*:\1:' | while read F; do + if [ -e "${F}" ]; then + # echo "DEBUG::gconf install ${F}" + ${ROOT}/usr/bin/gconftool-2 --makefile-install-rule ${F} 1>/dev/null + fi done fi |