diff options
| author | Florian Bäuerle <florian.baeuerle@allegion.com> | 2018-09-18 16:14:31 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-27 10:28:56 +0200 |
| commit | 682edb40ba542218c8020128ee013fe6bb737b3c (patch) | |
| tree | ad67bfdadf90d0026025639e87b83451eeeb7f45 /rules | |
| parent | acebfc49c9fe3e0911c220b349be7a60f9650d59 (diff) | |
| download | ptxdist-682edb40ba542218c8020128ee013fe6bb737b3c.tar.gz ptxdist-682edb40ba542218c8020128ee013fe6bb737b3c.tar.xz | |
xorg-font-ttf-vlgothic: 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-noto.make | 2 | ||||
| -rw-r--r-- | rules/xorg-font-ttf-vlgothic.make | 26 |
2 files changed, 11 insertions, 17 deletions
diff --git a/rules/xorg-font-ttf-noto.make b/rules/xorg-font-ttf-noto.make index ecd348ba4..ff64e72ba 100644 --- a/rules/xorg-font-ttf-noto.make +++ b/rules/xorg-font-ttf-noto.make @@ -1,7 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de> -# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com> +# (C) 2018 by Florian Bäuerle <florian.baeuerle@allegion.com> # # See CREDITS for details about who has contributed to this project. # diff --git a/rules/xorg-font-ttf-vlgothic.make b/rules/xorg-font-ttf-vlgothic.make index c2ab41bd0..e1010ba31 100644 --- a/rules/xorg-font-ttf-vlgothic.make +++ b/rules/xorg-font-ttf-vlgothic.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de> +# 2018 by Florian Bäuerle <florian.baeuerle@allegion.com> # # See CREDITS for details about who has contributed to this project. # @@ -31,15 +32,8 @@ XORG_FONT_TTF_VLGOTHIC_LICENSE_FILES := \ file://LICENSE_J.mplus;md5=0ec236dad673c87025379b1dc91ad7bd \ file://README.sazanami;encoding=euc-jp;md5=97d739900be6e852830f55aa3c07d4a0 -ifdef PTXCONF_XORG_FONT_TTF_VLGOTHIC -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-vlgothic.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - XORG_FONT_TTF_VLGOTHIC_CONF_TOOL := NO +XORG_FONT_TTF_VLGOTHIC_FONTDIR := $(XORG_FONTDIR)/truetype/vlgothic # ---------------------------------------------------------------------------- # Compile @@ -55,6 +49,7 @@ $(STATEDIR)/xorg-font-ttf-vlgothic.compile: $(STATEDIR)/xorg-font-ttf-vlgothic.install: @$(call targetinfo) + @$(call world/install-fonts,XORG_FONT_TTF_VLGOTHIC,*.ttf) @$(call touch) # ---------------------------------------------------------------------------- @@ -63,16 +58,15 @@ $(STATEDIR)/xorg-font-ttf-vlgothic.install: $(STATEDIR)/xorg-font-ttf-vlgothic.targetinstall: @$(call targetinfo) + @$(call install_init, xorg-font-ttf-vlgothic) + @$(call install_fixup, xorg-font-ttf-vlgothic,PRIORITY,optional) + @$(call install_fixup, xorg-font-ttf-vlgothic,SECTION,base) + @$(call install_fixup, xorg-font-ttf-vlgothic,AUTHOR,"Florian Bäuerle <florian.baeuerle@allegion.com>") + @$(call install_fixup, xorg-font-ttf-vlgothic,DESCRIPTION,missing) - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype - - @find $(XORG_FONT_TTF_VLGOTHIC_DIR) \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ - done + @$(call install_tree, xorg-font-ttf-vlgothic, 0, 0, -, /usr) + @$(call install_finish, xorg-font-ttf-vlgothic) @$(call touch) # vim: syntax=make |