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