Signed-off-by: Florian Bäuerle <[email protected]> --- rules/xorg-font-ttf-lohit-oriya.make | 45 +++++++++++++++++----------- 1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-oriya.make b/rules/xorg-font-ttf-lohit-oriya.make index 308cdd332..0acaf0074 100644 --- a/rules/xorg-font-ttf-lohit-oriya.make +++ b/rules/xorg-font-ttf-lohit-oriya.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. # @@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_ORIYA_LICENSE := OFL-1.1 XORG_FONT_TTF_LOHIT_ORIYA_LICENSE_FILES := \ file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245 -ifdef PTXCONF_XORG_FONT_TTF_LOHIT_ORIYA -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-oriya.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -XORG_FONT_TTF_LOHIT_ORIYA_CONF_TOOL := NO +XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-oriya +XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR := $(XORG_FONT_TTF_LOHIT_ORIYA_PKGDIR)$(XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR) # ---------------------------------------------------------------------------- # Compile @@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-oriya.compile: $(STATEDIR)/xorg-font-ttf-lohit-oriya.install: @$(call targetinfo) + + @rm -rf $(XORG_FONT_TTF_LOHIT_ORIYA_PKGDIR) + @mkdir -p $(XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR) + @find $(XORG_FONT_TTF_LOHIT_ORIYA_DIR) \ + -name "*.ttf" \ + | \ + while read file; do \ + install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR); \ + done + @mkfontscale $(XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR) + @mkfontdir $(XORG_FONT_TTF_LOHIT_ORIYA_FONTPKGDIR) + @$(call touch) # ---------------------------------------------------------------------------- @@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-oriya.install: $(STATEDIR)/xorg-font-ttf-lohit-oriya.targetinstall: @$(call targetinfo) - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype - - @find $(XORG_FONT_TTF_LOHIT_ORIYA_DIR) \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ - done - @$(call install_init, xorg-font-ttf-lohit-oriya) @$(call install_fixup, xorg-font-ttf-lohit-oriya,PRIORITY,optional) @$(call install_fixup, xorg-font-ttf-lohit-oriya,SECTION,base) @@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-oriya.targetinstall: $(XORG_FONT_TTF_LOHIT_ORIYA_DIR)/66-lohit-oriya.conf, \ /etc/fonts/conf.d/66-lohit-oriya.conf) + @$(call install_tree, xorg-font-ttf-lohit-oriya, 0, 0, -, $(XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR)) + +ifdef PTXCONF_XORG_FONTS_QT4_LINKS + @cd $(XORG_FONT_TTF_LOHIT_ORIYA_PKGDIR) && \ + find . -type f -name "*.ttf" | while read file; do \ + name=$$(basename $$file); \ + $(call install_link, xorg-font-ttf-lohit-oriya, \ + ../../..$(XORG_FONT_TTF_LOHIT_ORIYA_FONTDIR)/$$name, \ + /usr/lib/fonts/$$name); \ + done +endif + @$(call install_finish, xorg-font-ttf-lohit-oriya) @$(call touch) -- 2.18.0 _______________________________________________ ptxdist mailing list [email protected]
