[oe-commits] Martin Jansa : xorg-font-common.inc: allow fonts to be installed in /usr/ share it was fixed in c33a047eeda429ef01f6a0cf3948940474fa035f

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Dec 22 13:33:24 2009 +0100

xorg-font-common.inc: allow fonts to be installed in /usr/share it was fixed in c33a047eeda429ef01f6a0cf3948940474fa035f

---

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

diff --git a/recipes/xorg-font/xorg-font-common.inc b/recipes/xorg-font/xorg-font-common.inc
index 820161e..5cf40e8 100644
--- a/recipes/xorg-font/xorg-font-common.inc
+++ b/recipes/xorg-font/xorg-font-common.inc
@@ -13,16 +13,14 @@ 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