From 7107684b8dfabac4678d0ed1f3a5b8a35bf79240 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sun, 29 Jul 2007 22:20:39 +0000 Subject: Allow FONT_CONF to work outside of FILESDIR. --- eclass/font.eclass | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'eclass/font.eclass') diff --git a/eclass/font.eclass b/eclass/font.eclass index e5266be8ee4a..590d62a9b1f9 100644 --- a/eclass/font.eclass +++ b/eclass/font.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/font.eclass,v 1.24 2007/07/15 22:24:15 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.25 2007/07/29 22:20:39 dirtyepic Exp $ # Author: foser @@ -63,15 +63,15 @@ font_xft_config() { } font_fontconfig() { - local conffile - if has_version '>=media-libs/fontconfig-2.4'; then - insinto /etc/fonts/conf.avail/ - for conffile in "${FONT_CONF}"; do - [[ -e "${FILESDIR}/${conffile}" ]] && doins "${FILESDIR}/${conffile}" - done + if [[ -n ${FONT_CONF} ]]; then + if has_version '>=media-libs/fontconfig-2.4'; then + insinto /etc/fonts/conf.avail/ + for conffile in "${FONT_CONF}"; do + [[ -e ${conffile} ]] && doins ${conffile} + done + fi fi - } # -- cgit v1.2.3-65-gdbad