Signed-off-by: Florian Bäuerle <[email protected]> --- rules/xorg-font-ttf-hanazono.make | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/rules/xorg-font-ttf-hanazono.make b/rules/xorg-font-ttf-hanazono.make index 3a5a62bb2..71518020d 100644 --- a/rules/xorg-font-ttf-hanazono.make +++ b/rules/xorg-font-ttf-hanazono.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. # @@ -26,15 +27,8 @@ XORG_FONT_TTF_HANAZONO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_HANAZONO) XORG_FONT_TTF_HANAZONO_STRIP_LEVEL := 0 XORG_FONT_TTF_HANAZONO_LICENSE := OFL-1.1 -ifdef PTXCONF_XORG_FONT_TTF_HANAZONO -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-hanazono.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - XORG_FONT_TTF_HANAZONO_CONF_TOOL := NO +XORG_FONT_TTF_HANAZONO_FONTDIR := $(XORG_FONTDIR)/truetype/hanazono # ---------------------------------------------------------------------------- # Compile @@ -50,6 +44,7 @@ $(STATEDIR)/xorg-font-ttf-hanazono.compile: $(STATEDIR)/xorg-font-ttf-hanazono.install: @$(call targetinfo) + @$(call world/install-fonts,XORG_FONT_TTF_HANAZONO,*.ttf) @$(call touch) # ---------------------------------------------------------------------------- @@ -58,16 +53,15 @@ $(STATEDIR)/xorg-font-ttf-hanazono.install: $(STATEDIR)/xorg-font-ttf-hanazono.targetinstall: @$(call targetinfo) + @$(call install_init, xorg-font-ttf-hanazono) + @$(call install_fixup, xorg-font-ttf-hanazono,PRIORITY,optional) + @$(call install_fixup, xorg-font-ttf-hanazono,SECTION,base) + @$(call install_fixup, xorg-font-ttf-hanazono,AUTHOR,"Florian Bäuerle <[email protected]>") + @$(call install_fixup, xorg-font-ttf-hanazono,DESCRIPTION,missing) - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype - - @find $(XORG_FONT_TTF_HANAZONO_DIR) \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ - done + @$(call install_tree, xorg-font-ttf-hanazono, 0, 0, -, /usr) + @$(call install_finish, xorg-font-ttf-hanazono) @$(call touch) # vim: syntax=make -- 2.19.0 _______________________________________________ ptxdist mailing list [email protected]
