As all ttf font packages, xorg-font-ttf-android used to install fonts
into xorg-fonts' package and defers the mkfontdir- and mkfontscale steps
to xorg-fonts.targetinstall. This was a nice trick to spare the
generation of fonts.{dir,scale} in every font package, but it breaks the
collection feature for ttf-fonts.Signed-off-by: Florian Bäuerle <[email protected]> --- rules/xorg-font-ttf-android.make | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/rules/xorg-font-ttf-android.make b/rules/xorg-font-ttf-android.make index 443f855aa..9f308cb03 100644 --- a/rules/xorg-font-ttf-android.make +++ b/rules/xorg-font-ttf-android.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2015 by Michael Olbrich <[email protected]> +# (C) 2018 by Florian Bäuerle <[email protected]> # # See CREDITS for details about who has contributed to this project. # @@ -28,18 +29,8 @@ XORG_FONT_TTF_ANDROID_LICENSE := Apache-2.0 XORG_FONT_TTF_ANDROID_LICENSE_FILES := \ file://NOTICE;md5=9645f39e9db895a4aa6e02cb57294595 -ifdef PTXCONF_XORG_FONT_TTF_ANDROID -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-android.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -# -# autoconf -# -XORG_FONT_TTF_ANDROID_CONF_TOOL := NO +XORG_FONT_TTF_ANDROID_CONF_TOOL := NO +XORG_FONT_TTF_ANDROID_FONTDIR := $(XORG_FONTDIR)/truetype/android # ---------------------------------------------------------------------------- # Compile @@ -55,6 +46,7 @@ $(STATEDIR)/xorg-font-ttf-android.compile: $(STATEDIR)/xorg-font-ttf-android.install: @$(call targetinfo) + @$(call world/install-fonts,XORG_FONT_TTF_ANDROID,*.ttf) @$(call touch) # ---------------------------------------------------------------------------- @@ -63,16 +55,15 @@ $(STATEDIR)/xorg-font-ttf-android.install: $(STATEDIR)/xorg-font-ttf-android.targetinstall: @$(call targetinfo) + @$(call install_init, xorg-font-ttf-android) + @$(call install_fixup, xorg-font-ttf-android,PRIORITY,optional) + @$(call install_fixup, xorg-font-ttf-android,SECTION,base) + @$(call install_fixup, xorg-font-ttf-android,AUTHOR,"Florian Bäuerle <[email protected]>") + @$(call install_fixup, xorg-font-ttf-android,DESCRIPTION,missing) - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype - - @find $(XORG_FONT_TTF_ANDROID_DIR) \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ - done + @$(call install_tree, xorg-font-ttf-android, 0, 0, -, /) + @$(call install_finish, xorg-font-ttf-android) @$(call touch) # vim: syntax=make -- 2.19.0 _______________________________________________ ptxdist mailing list [email protected]
