[ptxdist] [PATCH v3 20/25] xorg-font-ttf-lohit-tamil: separate from xorg-fonts

["Florian Bäuerle" <florian.baeuerle@allegion.com>]

Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
 rules/xorg-font-ttf-lohit-tamil.make | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/rules/xorg-font-ttf-lohit-tamil.make b/rules/xorg-font-ttf-lohit-tamil.make
index 504269886..291d8a2ea 100644
--- a/rules/xorg-font-ttf-lohit-tamil.make
+++ b/rules/xorg-font-ttf-lohit-tamil.make
@@ -1,6 +1,7 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
+#           (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -27,15 +28,8 @@ XORG_FONT_TTF_LOHIT_TAMIL_LICENSE	:= OFL-1.1
 XORG_FONT_TTF_LOHIT_TAMIL_LICENSE_FILES := \
 	file://OFL.txt;md5=7dfa0a236dc535ad2d2548e6170c4402
 
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TAMIL
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-tamil.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
 XORG_FONT_TTF_LOHIT_TAMIL_CONF_TOOL	:= NO
+XORG_FONT_TTF_LOHIT_TAMIL_FONTDIR	:= $(XORG_FONTDIR)/truetype/lohit-tamil
 
 # ----------------------------------------------------------------------------
 # Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil.compile:
 
 $(STATEDIR)/xorg-font-ttf-lohit-tamil.install:
 	@$(call targetinfo)
+	@$(call world/install-fonts,XORG_FONT_TTF_LOHIT_TAMIL,*.ttf)
+	@mkdir -p $(XORG_FONT_TTF_LOHIT_TAMIL_PKGDIR)/etc/fonts/conf.d
+	@install -m 644 $(XORG_FONT_TTF_LOHIT_TAMIL_DIR)/66-lohit-tamil.conf \
+		$(XORG_FONT_TTF_LOHIT_TAMIL_PKGDIR)/etc/fonts/conf.d
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -59,25 +57,13 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil.install:
 
 $(STATEDIR)/xorg-font-ttf-lohit-tamil.targetinstall:
 	@$(call targetinfo)
-
-	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
-	@find $(XORG_FONT_TTF_LOHIT_TAMIL_DIR) \
-		-name "*.ttf" \
-		| \
-		while read file; do \
-		install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
-	done
-
 	@$(call install_init,  xorg-font-ttf-lohit-tamil)
 	@$(call install_fixup, xorg-font-ttf-lohit-tamil,PRIORITY,optional)
 	@$(call install_fixup, xorg-font-ttf-lohit-tamil,SECTION,base)
 	@$(call install_fixup, xorg-font-ttf-lohit-tamil,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
 	@$(call install_fixup, xorg-font-ttf-lohit-tamil,DESCRIPTION,missing)
 
-	@$(call install_copy, xorg-font-ttf-lohit-tamil, 0, 0, 644, \
-		$(XORG_FONT_TTF_LOHIT_TAMIL_DIR)/66-lohit-tamil.conf, \
-		/etc/fonts/conf.d/66-lohit-tamil.conf)
+	@$(call install_tree, xorg-font-ttf-lohit-tamil, 0, 0, -, /)
 
 	@$(call install_finish, xorg-font-ttf-lohit-tamil)
 	@$(call touch)
-- 
2.19.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de