From b2d45782eda080319e53b76dc47becfb88396ba2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 22 Dec 2009 13:33:24 +0100 Subject: [PATCH] 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 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/xorg-font/xorg-font-common.inc b/recipes/xorg-font/xorg-font-common.inc index 820161ef83..5cf40e8436 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 -- 2.39.5