Signed-off-by: Florian Bäuerle <[email protected]> --- rules/xorg-font-ttf-dejavu.make | 35 +++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/rules/xorg-font-ttf-dejavu.make b/rules/xorg-font-ttf-dejavu.make index bfe95bbd4..52aeab362 100644 --- a/rules/xorg-font-ttf-dejavu.make +++ b/rules/xorg-font-ttf-dejavu.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2015 by Philipp Zabel <[email protected]> +# (C) 2018 by Florian Bäuerle <[email protected]> # # See CREDITS for details about who has contributed to this project. # @@ -25,9 +26,8 @@ XORG_FONT_TTF_DEJAVU_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_DEJAVU).$(XORG_FONT_TTF XORG_FONT_TTF_DEJAVU_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_DEJAVU) XORG_FONT_TTF_DEJAVU_LICENSE := Bitstream-Vera AND public_domain -ifdef PTXCONF_XORG_FONT_TTF_DEJAVU -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-dejavu.targetinstall -endif +XORG_FONT_TTF_DEJAVU_FONTDIR := $(XORG_FONTDIR)/truetype/dejavu +XORG_FONT_TTF_DEJAVU_FONTPKGDIR := $(XORG_FONT_TTF_DEJAVU_PKGDIR)$(XORG_FONT_TTF_DEJAVU_FONTDIR) # ---------------------------------------------------------------------------- # Prepare @@ -61,6 +61,16 @@ $(STATEDIR)/xorg-font-ttf-dejavu.install: ln -s ../conf.avail/$$(basename $${file}) $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.d/$$(basename $${file}); \ done + @mkdir -p $(XORG_FONT_TTF_DEJAVU_FONTPKGDIR) + @find $(XORG_FONT_TTF_DEJAVU_DIR) \ + -name "*.ttf" \ + | \ + while read file; do \ + install -m 644 $${file} $(XORG_FONT_TTF_DEJAVU_FONTPKGDIR); \ + done + @mkfontscale $(XORG_FONT_TTF_DEJAVU_FONTPKGDIR) + @mkfontdir $(XORG_FONT_TTF_DEJAVU_FONTPKGDIR) + @$(call touch) # ---------------------------------------------------------------------------- @@ -72,13 +82,6 @@ $(STATEDIR)/xorg-font-ttf-dejavu.targetinstall: @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype - @find $(XORG_FONT_TTF_DEJAVU_DIR) \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ - done - @$(call install_init, xorg-font-ttf-dejavu) @$(call install_fixup, xorg-font-ttf-dejavu,PRIORITY,optional) @$(call install_fixup, xorg-font-ttf-dejavu,SECTION,base) @@ -88,6 +91,18 @@ $(STATEDIR)/xorg-font-ttf-dejavu.targetinstall: @$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /etc/fonts/conf.d) @$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /etc/fonts/conf.avail) + @$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, $(XORG_FONT_TTF_DEJAVU_FONTDIR)) + +ifdef PTXCONF_XORG_FONTS_QT4_LINKS + @cd $(XORG_FONT_TTF_DEJAVU_PKGDIR) && \ + find . -type f -name "*.ttf" | while read file; do \ + name=$$(basename $$file); \ + $(call install_link, xorg-font-ttf-dejavu, \ + ../../..$(XORG_FONT_TTF_DEJAVU_FONTDIR)/$$name, \ + /usr/lib/fonts/$$name); \ + done +endif + @$(call install_finish, xorg-font-ttf-dejavu) @$(call touch) -- 2.18.0 _______________________________________________ ptxdist mailing list [email protected]
