Signed-off-by: Florian Bäuerle <[email protected]> --- rules/xorg-font-ttf-lohit-punjabi.make | 29 +++++++------------------- 1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/rules/xorg-font-ttf-lohit-punjabi.make b/rules/xorg-font-ttf-lohit-punjabi.make index 0c18a7afa..bad702555 100644 --- a/rules/xorg-font-ttf-lohit-punjabi.make +++ b/rules/xorg-font-ttf-lohit-punjabi.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_PUNJABI_LICENSE := OFL-1.1 XORG_FONT_TTF_LOHIT_PUNJABI_LICENSE_FILES := \ file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245 -ifdef PTXCONF_XORG_FONT_TTF_LOHIT_PUNJABI -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - XORG_FONT_TTF_LOHIT_PUNJABI_CONF_TOOL := NO +XORG_FONT_TTF_LOHIT_PUNJABI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-punjabi # ---------------------------------------------------------------------------- # Compile @@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.compile: $(STATEDIR)/xorg-font-ttf-lohit-punjabi.install: @$(call targetinfo) + @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_PUNJABI,*.ttf) + @mkdir -p $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR)/etc/fonts/conf.d + @install -m 644 $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR)/66-lohit-punjabi.conf \ + $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR)/etc/fonts/conf.d @$(call touch) # ---------------------------------------------------------------------------- @@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.install: $(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall: @$(call targetinfo) - - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype - - @find $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR) \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ - done - @$(call install_init, xorg-font-ttf-lohit-punjabi) @$(call install_fixup, xorg-font-ttf-lohit-punjabi,PRIORITY,optional) @$(call install_fixup, xorg-font-ttf-lohit-punjabi,SECTION,base) @$(call install_fixup, xorg-font-ttf-lohit-punjabi,AUTHOR,"Michael Olbrich <[email protected]>") @$(call install_fixup, xorg-font-ttf-lohit-punjabi,DESCRIPTION,missing) - @$(call install_copy, xorg-font-ttf-lohit-punjabi, 0, 0, 644, \ - $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR)/66-lohit-punjabi.conf, \ - /etc/fonts/conf.d/66-lohit-punjabi.conf) + @$(call install_tree, xorg-font-ttf-lohit-punjabi, 0, 0, -, /etc) + @$(call install_tree, xorg-font-ttf-lohit-punjabi, 0, 0, -, /usr) @$(call install_finish, xorg-font-ttf-lohit-punjabi) @$(call touch) -- 2.19.0 _______________________________________________ ptxdist mailing list [email protected]
