From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sun, 8 Nov 2009 09:07:04 +0000 (+0100)
Subject: xorg-fongs: set fontdir in OECONF
X-Git-Tag: Release-2010-05/1~1198
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d30edff6cbf16dde1bcb77635fbc916a62ae45e0;p=openembedded.git

xorg-fongs: set fontdir in OECONF

* Set fontdir to ${libdir}/X11/fonts in OECONF
* New fonts wanted to install to ${datadir}/X11/fonts

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/recipes/xorg-font/xorg-font-common.inc b/recipes/xorg-font/xorg-font-common.inc
index 5cf40e8436..820161ef83 100644
--- a/recipes/xorg-font/xorg-font-common.inc
+++ b/recipes/xorg-font/xorg-font-common.inc
@@ -13,14 +13,16 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
-EXTRA_OEMAKE += "FCCACHE=/bin/true"
-
 do_configure_prepend() {
         if [ -f "${S}"/configure.ac ] ; then
                 sed -i "s#^MAPFILES_PATH=.*#MAPFILES_PATH=\"${STAGING_DIR_TARGET}/\$(pkg-config --variable=mapdir fontutil)\"#g" "${S}"/configure.ac
         fi
 }
 
+EXTRA_OECONF += " --with-fontrootdir=${libdir}/X11/fonts"
+
+EXTRA_OEMAKE += "FCCACHE=/bin/true"
+
 do_install_append() {
 	find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f
 	find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f