Signed-off-by: Florian Bäuerle <[email protected]> --- rules/xorg-font-ttf-bitstream-vera.make | 49 ++++++++++++++++--------- 1 file changed, 32 insertions(+), 17 deletions(-)
diff --git a/rules/xorg-font-ttf-bitstream-vera.make b/rules/xorg-font-ttf-bitstream-vera.make index eeb2f943e..5d89be1d7 100644 --- a/rules/xorg-font-ttf-bitstream-vera.make +++ b/rules/xorg-font-ttf-bitstream-vera.make @@ -2,6 +2,7 @@ # # Copyright (C) 2007 by Marc Kleine-Budde <[email protected]> # (C) 2010 by Michael Olbrich <[email protected]> +# (C) 2018 by Florian Bäuerle <[email protected]> # # See CREDITS for details about who has contributed to this project. # @@ -28,17 +29,8 @@ XORG_FONT_TTF_BITSTREAM_VERA_LICENSE := Bitstream-Vera XORG_FONT_TTF_BITSTREAM_VERA_LICENSE_FILES := \ file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be -ifdef PTXCONF_XORG_FONT_TTF_BITSTREAM_VERA -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-bitstream-vera.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -$(STATEDIR)/xorg-font-ttf-bitstream-vera.prepare: - @$(call targetinfo) - @$(call touch) +XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR := $(XORG_FONTDIR)/truetype/bitstream-vera +XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR := $(XORG_FONT_TTF_BITSTREAM_VERA_PKGDIR)$(XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR) # ---------------------------------------------------------------------------- # Compile @@ -54,6 +46,18 @@ $(STATEDIR)/xorg-font-ttf-bitstream-vera.compile: $(STATEDIR)/xorg-font-ttf-bitstream-vera.install: @$(call targetinfo) + + @rm -rf $(XORG_FONT_TTF_BITSTREAM_VERA_PKGDIR) + @mkdir -p $(XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR) + @find $(XORG_FONT_TTF_BITSTREAM_VERA_DIR) \ + -name "*.ttf" \ + | \ + while read file; do \ + install -m 644 $${file} $(XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR); \ + done + @mkfontscale $(XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR) + @mkfontdir $(XORG_FONT_TTF_BITSTREAM_VERA_FONTPKGDIR) + @$(call touch) # ---------------------------------------------------------------------------- @@ -63,14 +67,25 @@ $(STATEDIR)/xorg-font-ttf-bitstream-vera.install: $(STATEDIR)/xorg-font-ttf-bitstream-vera.targetinstall: @$(call targetinfo) - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype + @$(call install_init, xorg-font-ttf-bitstream-vera) + @$(call install_fixup, xorg-font-ttf-bitstream-vera,PRIORITY,optional) + @$(call install_fixup, xorg-font-ttf-bitstream-vera,SECTION,base) + @$(call install_fixup, xorg-font-ttf-bitstream-vera,AUTHOR,"Florian Bäuerle <[email protected]>") + @$(call install_fixup, xorg-font-ttf-bitstream-vera,DESCRIPTION,missing) - @find $(XORG_FONT_TTF_BITSTREAM_VERA_DIR) \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ + @$(call install_tree, xorg-font-ttf-bitstream-vera, 0, 0, -, $(XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR)) + +ifdef PTXCONF_XORG_FONTS_QT4_LINKS + @cd $(XORG_FONT_TTF_BITSTREAM_VERA_PKGDIR) && \ + find . -type f -name "*.ttf" | while read file; do \ + name=$$(basename $$file); \ + $(call install_link, xorg-font-ttf-bitstream-vera, \ + ../../..$(XORG_FONT_TTF_BITSTREAM_VERA_FONTDIR)/$$name, \ + /usr/lib/fonts/$$name); \ done +endif + + @$(call install_finish, xorg-font-ttf-bitstream-vera) @$(call touch) -- 2.18.0 _______________________________________________ ptxdist mailing list [email protected]
