diff options
| -rw-r--r-- | rules/graphics_and_multimedia.in | 18 | ||||
| -rw-r--r-- | rules/xorg-fonts.make | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in index b4ce36b3c..3124cd37a 100644 --- a/rules/graphics_and_multimedia.in +++ b/rules/graphics_and_multimedia.in @@ -7,7 +7,7 @@ endmenu menuconfig MENU_XORG_FONTS bool prompt "fonts " - select XORG_LIB_XFONT_PCF_FONTS if XORG_FONTS_XORG + select XORG_LIB_XFONT_PCF_FONTS if XORG_SERVER default y if XORG_SERVER help These fonts can be used with an x-server, standalone directfb or @@ -15,19 +15,15 @@ menuconfig MENU_XORG_FONTS if MENU_XORG_FONTS -config XORG_FONTS_XORG - bool - default XORG_SERVER - config XORG_FONTS depends on MENU_XORG_FONTS bool - select XORG_FONT_UTIL if XORG_FONTS_XORG - select XORG_FONT_ALIAS if XORG_FONTS_XORG - select HOST_XORG_APP_MKFONTDIR if XORG_FONTS_XORG - select HOST_XORG_APP_MKFONTSCALE if XORG_FONTS_XORG - select HOST_XORG_APP_BDFTOPCF if XORG_FONTS_XORG - select HOST_XORG_FONT_UTIL if XORG_FONTS_XORG + select XORG_FONT_UTIL + select XORG_FONT_ALIAS + select HOST_XORG_APP_MKFONTDIR + select HOST_XORG_APP_MKFONTSCALE + select HOST_XORG_APP_BDFTOPCF + select HOST_XORG_FONT_UTIL config XORG_FONTS_QT4_LINKS depends on QT4_PLATFORM_EMBEDDED diff --git a/rules/xorg-fonts.make b/rules/xorg-fonts.make index 50f4c8e38..83553de17 100644 --- a/rules/xorg-fonts.make +++ b/rules/xorg-fonts.make @@ -49,7 +49,6 @@ $(STATEDIR)/xorg-fonts.targetinstall: $(STATEDIR)/xorg-fonts.targetinstall.post: @$(call targetinfo) -ifdef PTXCONF_XORG_FONTS_XORG find $(XORG_FONTS_DIR_INSTALL) -mindepth 1 -type d | while read dir; do \ echo $$dir;\ case "$${dir}" in \ @@ -65,7 +64,6 @@ ifdef PTXCONF_XORG_FONTS_XORG mkfontdir $${dir} ;; \ esac; \ done -endif # FIXME: add fc-cache? |