Signed-off-by: Florian Bäuerle <[email protected]> --- rules/xorg-font-ttf-noto.make | 2 +- rules/xorg-font-ttf-vlgothic.make | 47 +++++++++++++++++++++---------- 2 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/rules/xorg-font-ttf-noto.make b/rules/xorg-font-ttf-noto.make index 23e8df78a..0ffea461b 100644 --- a/rules/xorg-font-ttf-noto.make +++ b/rules/xorg-font-ttf-noto.make @@ -1,7 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2015 by Michael Olbrich <[email protected]> -# 2018 by Florian Bäuerle <[email protected]> +# (C) 2018 by Florian Bäuerle <[email protected]> # # See CREDITS for details about who has contributed to this project. # diff --git a/rules/xorg-font-ttf-vlgothic.make b/rules/xorg-font-ttf-vlgothic.make index c2ab41bd0..41ac1f713 100644 --- a/rules/xorg-font-ttf-vlgothic.make +++ b/rules/xorg-font-ttf-vlgothic.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. # @@ -31,15 +32,8 @@ XORG_FONT_TTF_VLGOTHIC_LICENSE_FILES := \ file://LICENSE_J.mplus;md5=0ec236dad673c87025379b1dc91ad7bd \ file://README.sazanami;encoding=euc-jp;md5=97d739900be6e852830f55aa3c07d4a0 -ifdef PTXCONF_XORG_FONT_TTF_VLGOTHIC -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-vlgothic.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -XORG_FONT_TTF_VLGOTHIC_CONF_TOOL := NO +XORG_FONT_TTF_VLGOTHIC_FONTDIR := $(XORG_FONTDIR)/truetype/vlgothic +XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR := $(XORG_FONT_TTF_VLGOTHIC_PKGDIR)$(XORG_FONT_TTF_VLGOTHIC_FONTDIR) # ---------------------------------------------------------------------------- # Compile @@ -55,6 +49,18 @@ $(STATEDIR)/xorg-font-ttf-vlgothic.compile: $(STATEDIR)/xorg-font-ttf-vlgothic.install: @$(call targetinfo) + + @rm -rf $(XORG_FONT_TTF_VLGOTHIC_PKGDIR) + @mkdir -p $(XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR) + @find $(XORG_FONT_TTF_VLGOTHIC_DIR) \ + -name "*.ttf" \ + | \ + while read file; do \ + install -m 644 $${file} $(XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR); \ + done + @mkfontscale $(XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR) + @mkfontdir $(XORG_FONT_TTF_VLGOTHIC_FONTPKGDIR) + @$(call touch) # ---------------------------------------------------------------------------- @@ -64,14 +70,25 @@ $(STATEDIR)/xorg-font-ttf-vlgothic.install: $(STATEDIR)/xorg-font-ttf-vlgothic.targetinstall: @$(call targetinfo) - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype + @$(call install_init, xorg-font-ttf-vlgothic) + @$(call install_fixup, xorg-font-ttf-vlgothic,PRIORITY,optional) + @$(call install_fixup, xorg-font-ttf-vlgothic,SECTION,base) + @$(call install_fixup, xorg-font-ttf-vlgothic,AUTHOR,"Florian Bäuerle <[email protected]>") + @$(call install_fixup, xorg-font-ttf-vlgothic,DESCRIPTION,missing) - @find $(XORG_FONT_TTF_VLGOTHIC_DIR) \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ + @$(call install_tree, xorg-font-ttf-vlgothic, 0, 0, -, $(XORG_FONT_TTF_VLGOTHIC_FONTDIR)) + +ifdef PTXCONF_XORG_FONTS_QT4_LINKS + @cd $(XORG_FONT_TTF_VLGOTHIC_PKGDIR) && \ + find . -type f -name "*.ttf" | while read file; do \ + name=$$(basename $$file); \ + $(call install_link, xorg-font-ttf-vlgothic, \ + ../../..$(XORG_FONT_TTF_VLGOTHIC_FONTDIR)/$$name, \ + /usr/lib/fonts/$$name); \ done +endif + + @$(call install_finish, xorg-font-ttf-vlgothic) @$(call touch) -- 2.18.0 _______________________________________________ ptxdist mailing list [email protected]
