summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorFlorian Bäuerle <florian.baeuerle@allegion.com>2018-09-18 16:14:23 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-09-27 10:28:56 +0200
commit98de0f7d9c65d12d1f59be05c52bb419f05119e7 (patch)
treeffaed01eedbb772819cf65d82f68a9211d11e79d /rules
parent8013560b4fe93bbfb795f96ef51707a76675d506 (diff)
downloadptxdist-98de0f7d9c65d12d1f59be05c52bb419f05119e7.tar.gz
ptxdist-98de0f7d9c65d12d1f59be05c52bb419f05119e7.tar.xz
xorg-font-ttf-lohit-kannada: separate from xorg-fonts
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r--rules/xorg-font-ttf-lohit-kannada.make29
1 files changed, 8 insertions, 21 deletions
diff --git a/rules/xorg-font-ttf-lohit-kannada.make b/rules/xorg-font-ttf-lohit-kannada.make
index dca2bf84b..b6346dc06 100644
--- a/rules/xorg-font-ttf-lohit-kannada.make
+++ b/rules/xorg-font-ttf-lohit-kannada.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_KANNADA_LICENSE := OFL-1.1
XORG_FONT_TTF_LOHIT_KANNADA_LICENSE_FILES := \
file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245
-ifdef PTXCONF_XORG_FONT_TTF_LOHIT_KANNADA
-$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-kannada.targetinstall
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
XORG_FONT_TTF_LOHIT_KANNADA_CONF_TOOL := NO
+XORG_FONT_TTF_LOHIT_KANNADA_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-kannada
# ----------------------------------------------------------------------------
# Compile
@@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-kannada.compile:
$(STATEDIR)/xorg-font-ttf-lohit-kannada.install:
@$(call targetinfo)
+ @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_KANNADA,*.ttf)
+ @mkdir -p $(XORG_FONT_TTF_LOHIT_KANNADA_PKGDIR)/etc/fonts/conf.d
+ @install -m 644 $(XORG_FONT_TTF_LOHIT_KANNADA_DIR)/66-lohit-kannada.conf \
+ $(XORG_FONT_TTF_LOHIT_KANNADA_PKGDIR)/etc/fonts/conf.d
@$(call touch)
# ----------------------------------------------------------------------------
@@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-kannada.install:
$(STATEDIR)/xorg-font-ttf-lohit-kannada.targetinstall:
@$(call targetinfo)
-
- @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype
-
- @find $(XORG_FONT_TTF_LOHIT_KANNADA_DIR) \
- -name "*.ttf" \
- | \
- while read file; do \
- install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \
- done
-
@$(call install_init, xorg-font-ttf-lohit-kannada)
@$(call install_fixup, xorg-font-ttf-lohit-kannada,PRIORITY,optional)
@$(call install_fixup, xorg-font-ttf-lohit-kannada,SECTION,base)
@$(call install_fixup, xorg-font-ttf-lohit-kannada,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
@$(call install_fixup, xorg-font-ttf-lohit-kannada,DESCRIPTION,missing)
- @$(call install_copy, xorg-font-ttf-lohit-kannada, 0, 0, 644, \
- $(XORG_FONT_TTF_LOHIT_KANNADA_DIR)/66-lohit-kannada.conf, \
- /etc/fonts/conf.d/66-lohit-kannada.conf)
+ @$(call install_tree, xorg-font-ttf-lohit-kannada, 0, 0, -, /etc)
+ @$(call install_tree, xorg-font-ttf-lohit-kannada, 0, 0, -, /usr)
@$(call install_finish, xorg-font-ttf-lohit-kannada)
@$(call touch)