Signed-off-by: Florian Bäuerle <[email protected]> --- rules/xorg-font-ttf-carlito.make | 45 +++++++++++++++++++------------- 1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-carlito.make b/rules/xorg-font-ttf-carlito.make index e5e4468dd..ff1894cea 100644 --- a/rules/xorg-font-ttf-carlito.make +++ b/rules/xorg-font-ttf-carlito.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. # @@ -25,15 +26,8 @@ XORG_FONT_TTF_CARLITO_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_CARLITO).$(XORG_FONT_T XORG_FONT_TTF_CARLITO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_CARLITO) XORG_FONT_TTF_CARLITO_LICENSE := OFL-1.1 -ifdef PTXCONF_XORG_FONT_TTF_CARLITO -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-carlito.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -XORG_FONT_TTF_CARLITO_CONF_TOOL := NO +XORG_FONT_TTF_CARLITO_FONTDIR := $(XORG_FONTDIR)/truetype/carlito +XORG_FONT_TTF_CARLITO_FONTPKGDIR := $(XORG_FONT_TTF_CARLITO_PKGDIR)$(XORG_FONT_TTF_CARLITO_FONTDIR) # ---------------------------------------------------------------------------- # Compile @@ -41,6 +35,18 @@ XORG_FONT_TTF_CARLITO_CONF_TOOL := NO $(STATEDIR)/xorg-font-ttf-carlito.compile: @$(call targetinfo) + + @rm -rf $(XORG_FONT_TTF_CARLITO_PKGDIR) + @mkdir -p $(XORG_FONT_TTF_CARLITO_FONTPKGDIR) + @find $(XORG_FONT_TTF_CARLITO_DIR) \ + -name "*.ttf" \ + | \ + while read file; do \ + install -m 644 $${file} $(XORG_FONT_TTF_CARLITO_FONTPKGDIR); \ + done + @mkfontscale $(XORG_FONT_TTF_CARLITO_FONTPKGDIR) + @mkfontdir $(XORG_FONT_TTF_CARLITO_FONTPKGDIR) + @$(call touch) # ---------------------------------------------------------------------------- @@ -58,15 +64,6 @@ $(STATEDIR)/xorg-font-ttf-carlito.install: $(STATEDIR)/xorg-font-ttf-carlito.targetinstall: @$(call targetinfo) - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype - - @find $(XORG_FONT_TTF_CARLITO_DIR) \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ - done - @$(call install_init, xorg-font-ttf-carlito) @$(call install_fixup, xorg-font-ttf-carlito,PRIORITY,optional) @$(call install_fixup, xorg-font-ttf-carlito,SECTION,base) @@ -78,6 +75,18 @@ $(STATEDIR)/xorg-font-ttf-carlito.targetinstall: @$(call install_alternative, xorg-font-ttf-carlito, 0, 0, 644, \ /etc/fonts/conf.d/62-google-crosextra-carlito-fontconfig.conf) + @$(call install_tree, xorg-font-ttf-carlito, 0, 0, -, $(XORG_FONT_TTF_CARLITO_FONTDIR)) + +ifdef PTXCONF_XORG_FONTS_QT4_LINKS + @cd $(XORG_FONT_TTF_CARLITO_PKGDIR) && \ + find . -type f -name "*.ttf" | while read file; do \ + name=$$(basename $$file); \ + $(call install_link, xorg-font-ttf-carlito, \ + ../../..$(XORG_FONT_TTF_CARLITO_FONTDIR)/$$name, \ + /usr/lib/fonts/$$name); \ + done +endif + @$(call install_finish, xorg-font-ttf-carlito) @$(call touch) -- 2.18.0 _______________________________________________ ptxdist mailing list [email protected]
