[ptxdist] [PATCH v2 17/23] xorg-font-ttf-lohit-tamil-classical: isolate from xorg-fonts

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

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

diff --git a/rules/xorg-font-ttf-lohit-tamil-classical.make b/rules/xorg-font-ttf-lohit-tamil-classical.make
index 548552346..3c12983f9 100644
--- a/rules/xorg-font-ttf-lohit-tamil-classical.make
+++ b/rules/xorg-font-ttf-lohit-tamil-classical.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_CLASSICAL_LICENSE	:= OFL-1.1
 XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_LICENSE_FILES := \
 	file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
 
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_CONF_TOOL	:= NO
+XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR		:= $(XORG_FONTDIR)/truetype/lohit-tamil-classical
+XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR	:= $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR)$(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR)
 
 # ----------------------------------------------------------------------------
 # Compile
@@ -51,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.compile:
 
 $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.install:
 	@$(call targetinfo)
+
+	@rm -rf $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR)
+	@mkdir -p $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR)
+	@find $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR) \
+		-name "*.ttf" \
+		| \
+		while read file; do \
+		install -m 644 $${file} $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR); \
+	done
+	@mkfontscale $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR)
+	@mkfontdir $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTPKGDIR)
+
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -60,15 +66,6 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.install:
 $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.targetinstall:
 	@$(call targetinfo)
 
-	@mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
-	@find $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_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-classical)
 	@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,PRIORITY,optional)
 	@$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,SECTION,base)
@@ -79,6 +76,18 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.targetinstall:
 		$(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR)/66-lohit-tamil-classical.conf, \
 		/etc/fonts/conf.d/66-lohit-tamil-classical.conf)
 
+	@$(call install_tree, xorg-font-ttf-lohit-tamil-classical, 0, 0, -, $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR))
+
+ifdef PTXCONF_XORG_FONTS_QT4_LINKS
+	@cd $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR) && \
+	find . -type f -name "*.ttf" | while read file; do \
+		name=$$(basename $$file); \
+		$(call install_link, xorg-font-ttf-lohit-tamil-classical, \
+			../../..$(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_FONTDIR)/$$name, \
+			/usr/lib/fonts/$$name); \
+	done
+endif
+
 	@$(call install_finish, xorg-font-ttf-lohit-tamil-classical)
 	@$(call touch)
 
-- 
2.18.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de