diff options
| author | Florian Bäuerle <florian.baeuerle@allegion.com> | 2018-09-18 16:14:27 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-27 10:28:56 +0200 |
| commit | 84953bf862cd0f6d3af49a01bcdc72d236e62737 (patch) | |
| tree | 33ab5c7d0291ccaa012b62d67f7202cf6b562691 /rules | |
| parent | ebfa9a033500d1b246ddf8b5ada821aec41daeb8 (diff) | |
| download | ptxdist-84953bf862cd0f6d3af49a01bcdc72d236e62737.tar.gz ptxdist-84953bf862cd0f6d3af49a01bcdc72d236e62737.tar.xz | |
xorg-font-ttf-lohit-tamil-classical: 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-tamil-classical.make | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/rules/xorg-font-ttf-lohit-tamil-classical.make b/rules/xorg-font-ttf-lohit-tamil-classical.make index 548552346..1f6499f46 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 # ---------------------------------------------------------------------------- # Compile @@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.compile: $(STATEDIR)/xorg-font-ttf-lohit-tamil-classical.install: @$(call targetinfo) + @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL,*.ttf) + @mkdir -p $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR)/etc/fonts/conf.d + @install -m 644 $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_DIR)/66-lohit-tamil-classical.conf \ + $(XORG_FONT_TTF_LOHIT_TAMIL_CLASSICAL_PKGDIR)/etc/fonts/conf.d @$(call touch) # ---------------------------------------------------------------------------- @@ -59,25 +57,14 @@ $(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) @$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>") @$(call install_fixup, xorg-font-ttf-lohit-tamil-classical,DESCRIPTION,missing) - @$(call install_copy, xorg-font-ttf-lohit-tamil-classical, 0, 0, 644, \ - $(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, -, /etc) + @$(call install_tree, xorg-font-ttf-lohit-tamil-classical, 0, 0, -, /usr) @$(call install_finish, xorg-font-ttf-lohit-tamil-classical) @$(call touch) |