2
1
Эх сурвалжийг харах

font-misc-misc: Don't pull fonts encodings from host system

Use encodings from staging dir.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Vasily Khoruzhick 14 жил өмнө
parent
commit
5276dec0e0

+ 6 - 0
package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk

@@ -12,5 +12,11 @@ XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(
 XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
+define XFONT_FONT_MISC_MISC_MAPFILES_PATH_FIX
+	$(SED) 's|UTIL_DIR = |UTIL_DIR = $(STAGING_DIR)|' $(@D)/Makefile
+endef
+
+XFONT_FONT_MISC_MISC_POST_CONFIGURE_HOOKS += XFONT_FONT_MISC_MISC_MAPFILES_PATH_FIX
+
 $(eval $(call AUTOTARGETS,package/x11r7,xfont_font-misc-misc))