diff options
| author | Florian Bäuerle <florian.baeuerle@allegion.com> | 2018-09-18 16:14:13 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-25 15:40:20 +0200 |
| commit | 834e6637d7eb94a6df9bd15aa2217834ff600f07 (patch) | |
| tree | 32eeb4c84a9956a1d4aad930a8d8cf779c936a24 /rules/xorg-font-ttf-caladea.make | |
| parent | 6ab23223c246551d410d4cedc6ab70b852445f0d (diff) | |
| download | ptxdist-834e6637d7eb94a6df9bd15aa2217834ff600f07.tar.gz ptxdist-834e6637d7eb94a6df9bd15aa2217834ff600f07.tar.xz | |
xorg-font-ttf-caladea: 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/xorg-font-ttf-caladea.make')
| -rw-r--r-- | rules/xorg-font-ttf-caladea.make | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/rules/xorg-font-ttf-caladea.make b/rules/xorg-font-ttf-caladea.make index e0c83a600..1f76f7697 100644 --- a/rules/xorg-font-ttf-caladea.make +++ b/rules/xorg-font-ttf-caladea.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. # @@ -25,15 +26,8 @@ XORG_FONT_TTF_CALADEA_SOURCE := $(SRCDIR)/$(XORG_FONT_TTF_CALADEA).$(XORG_FONT_T XORG_FONT_TTF_CALADEA_DIR := $(BUILDDIR)/$(XORG_FONT_TTF_CALADEA) XORG_FONT_TTF_CALADEA_LICENSE := Apache-2.0 -ifdef PTXCONF_XORG_FONT_TTF_CALADEA -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-caladea.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - XORG_FONT_TTF_CALADEA_CONF_TOOL := NO +XORG_FONT_TTF_CALADEA_FONTDIR := $(XORG_FONTDIR)/truetype/caladea # ---------------------------------------------------------------------------- # Compile @@ -49,6 +43,7 @@ $(STATEDIR)/xorg-font-ttf-caladea.compile: $(STATEDIR)/xorg-font-ttf-caladea.install: @$(call targetinfo) + @$(call world/install-fonts,XORG_FONT_TTF_CALADEA,*.ttf) @$(call touch) # ---------------------------------------------------------------------------- @@ -57,16 +52,6 @@ $(STATEDIR)/xorg-font-ttf-caladea.install: $(STATEDIR)/xorg-font-ttf-caladea.targetinstall: @$(call targetinfo) - - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype - - @find $(XORG_FONT_TTF_CALADEA_DIR) \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ - done - @$(call install_init, xorg-font-ttf-caladea) @$(call install_fixup, xorg-font-ttf-caladea,PRIORITY,optional) @$(call install_fixup, xorg-font-ttf-caladea,SECTION,base) @@ -78,8 +63,9 @@ $(STATEDIR)/xorg-font-ttf-caladea.targetinstall: @$(call install_alternative, xorg-font-ttf-caladea, 0, 0, 644, \ /etc/fonts/conf.d/62-google-crosextra-caladea-fontconfig.conf) - @$(call install_finish, xorg-font-ttf-caladea) + @$(call install_tree, xorg-font-ttf-caladea, 0, 0, -, /usr) + @$(call install_finish, xorg-font-ttf-caladea) @$(call touch) # vim: syntax=make |