Signed-off-by: Florian Bäuerle <[email protected]> --- rules/xorg-font-bh-ttf.make | 36 +++++++++++++------------------ rules/xorg-font-ttf-vlgothic.make | 2 +- 2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/rules/xorg-font-bh-ttf.make b/rules/xorg-font-bh-ttf.make index 59a290094..b935bfa07 100644 --- a/rules/xorg-font-bh-ttf.make +++ b/rules/xorg-font-bh-ttf.make @@ -2,6 +2,7 @@ # # Copyright (C) 2006 by Erwin Rol # (C) 2010 by Michael Olbrich <[email protected]> +# (C) 2018 by Florian Bäuerle <[email protected]> # # See CREDITS for details about who has contributed to this project. # @@ -26,23 +27,16 @@ XORG_FONT_BH_TTF_SOURCE := $(SRCDIR)/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUF XORG_FONT_BH_TTF_DIR := $(BUILDDIR)/$(XORG_FONT_BH_TTF) XORG_FONT_BH_TTF_LICENSE := Luxi -ifdef PTXCONF_XORG_FONT_BH_TTF -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-bh-ttf.targetinstall -endif +XORG_FONT_BH_TTF_CONF_TOOL := NO +XORG_FONT_BH_TTF_FONTDIR := $(XORG_FONTDIR)/truetype/bh # ---------------------------------------------------------------------------- -# Prepare +# Compile # ---------------------------------------------------------------------------- -XORG_FONT_BH_TTF_PATH := PATH=$(CROSS_PATH) -XORG_FONT_BH_TTF_ENV := $(CROSS_ENV) - -# -# autoconf -# -XORG_FONT_BH_TTF_AUTOCONF := \ - $(CROSS_AUTOCONF_USR) \ - --with-fontdir=$(XORG_FONTDIR)/truetype +$(STATEDIR)/xorg-font-bh-ttf.compile: + @$(call targetinfo) + @$(call touch) # ---------------------------------------------------------------------------- # Install @@ -50,6 +44,7 @@ XORG_FONT_BH_TTF_AUTOCONF := \ $(STATEDIR)/xorg-font-bh-ttf.install: @$(call targetinfo) + @$(call world/install-fonts,XORG_FONT_BH_TTF,*.ttf) @$(call touch) # ---------------------------------------------------------------------------- @@ -58,16 +53,15 @@ $(STATEDIR)/xorg-font-bh-ttf.install: $(STATEDIR)/xorg-font-bh-ttf.targetinstall: @$(call targetinfo) + @$(call install_init, xorg-font-bh-ttf) + @$(call install_fixup, xorg-font-bh-ttf,PRIORITY,optional) + @$(call install_fixup, xorg-font-bh-ttf,SECTION,base) + @$(call install_fixup, xorg-font-bh-ttf,AUTHOR,"Florian Bäuerle <[email protected]>") + @$(call install_fixup, xorg-font-bh-ttf,DESCRIPTION,missing) - @mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype - - @find $(XORG_FONT_BH_TTF_DIR) \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ - done + @$(call install_tree, xorg-font-bh-ttf, 0, 0, -, /usr) + @$(call install_finish, xorg-font-bh-ttf) @$(call touch) # vim: syntax=make diff --git a/rules/xorg-font-ttf-vlgothic.make b/rules/xorg-font-ttf-vlgothic.make index e1010ba31..22ec1ddc4 100644 --- a/rules/xorg-font-ttf-vlgothic.make +++ b/rules/xorg-font-ttf-vlgothic.make @@ -1,7 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2015 by Michael Olbrich <[email protected]> -# 2018 by Florian Bäuerle <[email protected]> +# (C) 2018 by Florian Bäuerle <[email protected]> # # See CREDITS for details about who has contributed to this project. # -- 2.19.0 _______________________________________________ ptxdist mailing list [email protected]
