Signed-off-by: Florian Bäuerle <[email protected]> --- rules/xorg-font-ttf-dejavu.make | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-dejavu.make b/rules/xorg-font-ttf-dejavu.make index bfe95bbd4..0bdd0c4c1 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_CONF_TOOL := NO +XORG_FONT_TTF_DEJAVU_FONTDIR := $(XORG_FONTDIR)/truetype/dejavu # ---------------------------------------------------------------------------- # Prepare @@ -52,13 +52,14 @@ $(STATEDIR)/xorg-font-ttf-dejavu.compile: $(STATEDIR)/xorg-font-ttf-dejavu.install: @$(call targetinfo) - @rm -rf $(XORG_FONT_TTF_DEJAVU_PKGDIR) + @$(call world/install-fonts,XORG_FONT_TTF_DEJAVU,*.ttf) @mkdir -p $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.avail @mkdir -p $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.d @for file in $(XORG_FONT_TTF_DEJAVU_DIR)/fontconfig/*.conf; do \ + name=$$(basename $${file}); \ install -m 644 $${file} $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.avail; \ - ln -s ../conf.avail/$$(basename $${file}) $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.d/$$(basename $${file}); \ + ln -s ../conf.avail/$${name} $(XORG_FONT_TTF_DEJAVU_PKGDIR)/etc/fonts/conf.d/$${name}; \ done @$(call touch) @@ -69,27 +70,16 @@ $(STATEDIR)/xorg-font-ttf-dejavu.install: $(STATEDIR)/xorg-font-ttf-dejavu.targetinstall: @$(call targetinfo) - - @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) @$(call install_fixup, xorg-font-ttf-dejavu,AUTHOR,"Philipp Zabel <[email protected]>") @$(call install_fixup, xorg-font-ttf-dejavu,DESCRIPTION,missing) - @$(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, -, /etc) + @$(call install_tree, xorg-font-ttf-dejavu, 0, 0, -, /usr) @$(call install_finish, xorg-font-ttf-dejavu) - @$(call touch) # vim: syntax=make -- 2.19.0 _______________________________________________ ptxdist mailing list [email protected]
