Signed-off-by: Florian Bäuerle <florian.baeue...@allegion.com>
---
rules/xorg-font-ttf-carlito.make | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/rules/xorg-font-ttf-carlito.make b/rules/xorg-font-ttf-carlito.make
index e5e4468dd..615a9b735 100644
--- a/rules/xorg-font-ttf-carlito.make
+++ b/rules/xorg-font-ttf-carlito.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Olbrich <m.olbr...@pengutronix.de>
+# (C) 2018 by Florian Bäuerle <florian.baeue...@allegion.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -25,15 +26,8 @@ XORG_FONT_TTF_CARLITO_SOURCE :=
$(SRCDIR)/$(XORG_FONT_TTF_CARLITO).$(XORG_FONT_T
XORG_FONT_TTF_CARLITO_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_CARLITO)
XORG_FONT_TTF_CARLITO_LICENSE := OFL-1.1
-ifdef PTXCONF_XORG_FONT_TTF_CARLITO
-$(STATEDIR)/xorg-fonts.targetinstall.post:
$(STATEDIR)/xorg-font-ttf-carlito.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_CARLITO_CONF_TOOL := NO
+XORG_FONT_TTF_CARLITO_FONTDIR := $(XORG_FONTDIR)/truetype/carlito
# ----------------------------------------------------------------------------
# Compile
@@ -49,6 +43,7 @@ $(STATEDIR)/xorg-font-ttf-carlito.compile:
$(STATEDIR)/xorg-font-ttf-carlito.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_CARLITO,*.ttf)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -57,16 +52,6 @@ $(STATEDIR)/xorg-font-ttf-carlito.install:
$(STATEDIR)/xorg-font-ttf-carlito.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_CARLITO_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-carlito)
@$(call install_fixup, xorg-font-ttf-carlito,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-carlito,SECTION,base)
@@ -78,8 +63,9 @@ $(STATEDIR)/xorg-font-ttf-carlito.targetinstall:
@$(call install_alternative, xorg-font-ttf-carlito, 0, 0, 644, \
/etc/fonts/conf.d/62-google-crosextra-carlito-fontconfig.conf)
- @$(call install_finish, xorg-font-ttf-carlito)
+ @$(call install_tree, xorg-font-ttf-carlito, 0, 0, -, /usr)
+ @$(call install_finish, xorg-font-ttf-carlito)
@$(call touch)
# vim: syntax=make
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
