From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Tue, 21 Jan 2014 15:29:33 +0000 (+0400)
Subject: look for DejaVu also in /usr/share/fonts/truetype
X-Git-Tag: 2.02-beta3~685
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36387ece6be1b912c778d4a5f068801f99385fa2;p=thirdparty%2Fgrub.git

look for DejaVu also in /usr/share/fonts/truetype

It is installed in this path on openSUSE.
---

diff --git a/ChangeLog b/ChangeLog
index f5618a6eb..9f5d81dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-21  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* configure.ac: Look for DejaVuSans also in /usr/share/fonts/truetype.
+
 2014-01-21  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
 
 	* grub-core/net/arp.c (grub_net_arp_send_request): Increase network try
diff --git a/configure.ac b/configure.ac
index cf3de3be1..120263e9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1389,7 +1389,7 @@ fi
 
 if test x"$starfield_excuse" = x; then
    for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
-     for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu; do
+     for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
         if test -f "$dir/DejaVuSans.$ext"; then
           DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
           break 2