summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-10-30 05:56:11 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-10-30 05:56:11 +0000
commit321adb6c5862f7c4d04a36b74e9def6fd9ace353 (patch)
tree82787333d8ac2ea05d05ab8fc8392928ac784918 /eclass/font.eclass
parentStop using two different ways to detect font directories. (diff)
downloadhistorical-321adb6c5862f7c4d04a36b74e9def6fd9ace353.tar.gz
historical-321adb6c5862f7c4d04a36b74e9def6fd9ace353.tar.bz2
historical-321adb6c5862f7c4d04a36b74e9def6fd9ace353.zip
Some initial changes so x-modular.eclass can start using this: Allow for DOCS to not exist without errors, and don't remove fonts.cache-1 if it doesn't exist.
Diffstat (limited to 'eclass/font.eclass')
-rw-r--r--eclass/font.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/font.eclass b/eclass/font.eclass
index bd5c6845b910..2570d0a49431 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.19 2006/09/17 14:33:59 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.20 2006/10/30 05:56:11 dberkholz Exp $
# Author: foser <foser@gentoo.org>
@@ -84,7 +84,7 @@ font_src_install() {
cd "${S}"
# try to install some common docs
DOCS="${DOCS} COPYRIGHT README NEWS"
- dodoc ${DOCS}
+ dodoc ${DOCS} 2> /dev/null
}
@@ -92,7 +92,7 @@ font_pkg_setup() {
# make sure we get no colissions
# setup is not the nicest place, but preinst doesn't cut it
- rm -f "${FONTDIR}/fonts.cache-1"
+ [[ -e "${FONTDIR}/fonts.cache-1" ]] && rm -f "${FONTDIR}/fonts.cache-1"
}