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

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