[oe-commits] Martin Jansa : xorg-fongs: set fontdir in OECONF

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: d30edff6cbf16dde1bcb77635fbc916a62ae45e0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d30edff6cbf16dde1bcb77635fbc916a62ae45e0

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Nov  8 10:07:04 2009 +0100

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 at gmail.com>

---

 recipes/xorg-font/xorg-font-common.inc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes/xorg-font/xorg-font-common.inc b/recipes/xorg-font/xorg-font-common.inc
index 5cf40e8..820161e 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