diff options
author | Ryan Hill <rhill@gentoo.org> | 2007-07-29 22:20:39 +0000 |
---|---|---|
committer | Ryan Hill <rhill@gentoo.org> | 2007-07-29 22:20:39 +0000 |
commit | 7107684b8dfabac4678d0ed1f3a5b8a35bf79240 (patch) | |
tree | dd364968cd97e0d99734759ee9ffccbba956d4af /eclass/font.eclass | |
parent | Specify path in FONT_CONF. (diff) | |
download | historical-7107684b8dfabac4678d0ed1f3a5b8a35bf79240.tar.gz historical-7107684b8dfabac4678d0ed1f3a5b8a35bf79240.tar.bz2 historical-7107684b8dfabac4678d0ed1f3a5b8a35bf79240.zip |
Allow FONT_CONF to work outside of FILESDIR.
Diffstat (limited to 'eclass/font.eclass')
-rw-r--r-- | eclass/font.eclass | 16 |
1 files changed, 8 insertions, 8 deletions
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 <foser@gentoo.org> @@ -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 - } # |