diff options
| author | Florian Bäuerle <florian.baeuerle@allegion.com> | 2018-09-18 16:14:26 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-27 10:28:56 +0200 |
| commit | ebfa9a033500d1b246ddf8b5ada821aec41daeb8 (patch) | |
| tree | 6fa163f7570f498a0d591931a06e4f3231577b31 /rules | |
| parent | 3690fa6e3b30ac162c608371bda12cf4b0862b92 (diff) | |
| download | ptxdist-ebfa9a033500d1b246ddf8b5ada821aec41daeb8.tar.gz ptxdist-ebfa9a033500d1b246ddf8b5ada821aec41daeb8.tar.xz | |
xorg-font-ttf-lohit-punjabi: 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-punjabi.make | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/rules/xorg-font-ttf-lohit-punjabi.make b/rules/xorg-font-ttf-lohit-punjabi.make index 0c18a7afa..bad702555 100644 --- a/rules/xorg-font-ttf-lohit-punjabi.make +++ b/rules/xorg-font-ttf-lohit-punjabi.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_PUNJABI_LICENSE := OFL-1.1 XORG_FONT_TTF_LOHIT_PUNJABI_LICENSE_FILES := \ file://OFL.txt;md5=e56537d157e0ee370c0d8468da33e245 -ifdef PTXCONF_XORG_FONT_TTF_LOHIT_PUNJABI -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - XORG_FONT_TTF_LOHIT_PUNJABI_CONF_TOOL := NO +XORG_FONT_TTF_LOHIT_PUNJABI_FONTDIR := $(XORG_FONTDIR)/truetype/lohit-punjabi # ---------------------------------------------------------------------------- # Compile @@ -51,6 +45,10 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.compile: $(STATEDIR)/xorg-font-ttf-lohit-punjabi.install: @$(call targetinfo) + @$(call world/install-fonts,XORG_FONT_TTF_LOHIT_PUNJABI,*.ttf) + @mkdir -p $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR)/etc/fonts/conf.d + @install -m 644 $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR)/66-lohit-punjabi.conf \ + $(XORG_FONT_TTF_LOHIT_PUNJABI_PKGDIR)/etc/fonts/conf.d @$(call touch) # ---------------------------------------------------------------------------- @@ -59,25 +57,14 @@ $(STATEDIR)/xorg-font-ttf-lohit-punjabi.install: $(STATEDIR)/xorg-font-ttf-lohit-punjabi.targetinstall: @$(call targetinfo) - - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype - - @find $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR) \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ - done - @$(call install_init, xorg-font-ttf-lohit-punjabi) @$(call install_fixup, xorg-font-ttf-lohit-punjabi,PRIORITY,optional) @$(call install_fixup, xorg-font-ttf-lohit-punjabi,SECTION,base) @$(call install_fixup, xorg-font-ttf-lohit-punjabi,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>") @$(call install_fixup, xorg-font-ttf-lohit-punjabi,DESCRIPTION,missing) - @$(call install_copy, xorg-font-ttf-lohit-punjabi, 0, 0, 644, \ - $(XORG_FONT_TTF_LOHIT_PUNJABI_DIR)/66-lohit-punjabi.conf, \ - /etc/fonts/conf.d/66-lohit-punjabi.conf) + @$(call install_tree, xorg-font-ttf-lohit-punjabi, 0, 0, -, /etc) + @$(call install_tree, xorg-font-ttf-lohit-punjabi, 0, 0, -, /usr) @$(call install_finish, xorg-font-ttf-lohit-punjabi) @$(call touch) |