Signed-off-by: Florian Bäuerle <[email protected]> --- rules/xorg-font-ttf-noto.make | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/rules/xorg-font-ttf-noto.make b/rules/xorg-font-ttf-noto.make index 044d4196d..ecd348ba4 100644 --- a/rules/xorg-font-ttf-noto.make +++ b/rules/xorg-font-ttf-noto.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2015 by Michael Olbrich <[email protected]> +# 2018 by Florian Bäuerle <[email protected]> # # See CREDITS for details about who has contributed to this project. # @@ -25,15 +26,8 @@ XORG_FONT_TTF_NOTO_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_NOTO).$(XORG_FONT_TTF_NOT XORG_FONT_TTF_NOTO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_NOTO) XORG_FONT_TTF_NOTO_LICENSE := OFL-1.1 -ifdef PTXCONF_XORG_FONT_TTF_NOTO -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-noto.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - XORG_FONT_TTF_NOTO_CONF_TOOL := NO +XORG_FONT_TTF_NOTO_FONTDIR := $(XORG_FONTDIR)/truetype/noto # ---------------------------------------------------------------------------- # Compile @@ -49,6 +43,7 @@ $(STATEDIR)/xorg-font-ttf-noto.compile: $(STATEDIR)/xorg-font-ttf-noto.install: @$(call targetinfo) + @$(call world/install-fonts,XORG_FONT_TTF_NOTO,*.ttf) @$(call touch) # ---------------------------------------------------------------------------- @@ -57,16 +52,15 @@ $(STATEDIR)/xorg-font-ttf-noto.install: $(STATEDIR)/xorg-font-ttf-noto.targetinstall: @$(call targetinfo) + @$(call install_init, xorg-font-ttf-noto) + @$(call install_fixup, xorg-font-ttf-noto,PRIORITY,optional) + @$(call install_fixup, xorg-font-ttf-noto,SECTION,base) + @$(call install_fixup, xorg-font-ttf-noto,AUTHOR,"Florian Bäuerle <[email protected]>") + @$(call install_fixup, xorg-font-ttf-noto,DESCRIPTION,missing) - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype - - @find $(XORG_FONT_TTF_NOTO_DIR)/{unhinted,hinted} \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ - done + @$(call install_tree, xorg-font-ttf-noto, 0, 0, -, /usr) + @$(call install_finish, xorg-font-ttf-noto) @$(call touch) # vim: syntax=make -- 2.19.0 _______________________________________________ ptxdist mailing list [email protected]
