Signed-off-by: Florian Bäuerle <[email protected]> --- rules/xorg-font-ttf-liberation.make | 49 +++++++++++++++++++---------- 1 file changed, 32 insertions(+), 17 deletions(-)
diff --git a/rules/xorg-font-ttf-liberation.make b/rules/xorg-font-ttf-liberation.make index 1e60a18bc..69d438f48 100644 --- a/rules/xorg-font-ttf-liberation.make +++ b/rules/xorg-font-ttf-liberation.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2015 by Philipp Zabel <[email protected]> +# (C) 2018 by Florian Bäuerle <[email protected]> # # See CREDITS for details about who has contributed to this project. # @@ -27,17 +28,8 @@ XORG_FONT_TTF_LIBERATION_LICENSE := OFL-1.1 XORG_FONT_TTF_LIBERATION_LICENSE_FILES := \ file://LICENSE;md5=f96db970a9a46c5369142b99f530366b -ifdef PTXCONF_XORG_FONT_TTF_LIBERATION -$(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-liberation.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -$(STATEDIR)/xorg-font-ttf-liberation.prepare: - @$(call targetinfo) - @$(call touch) +XORG_FONT_TTF_LIBERATION_FONTDIR := $(XORG_FONTDIR)/truetype/liberation +XORG_FONT_TTF_LIBERATION_FONTPKGDIR := $(XORG_FONT_TTF_LIBERATION_PKGDIR)$(XORG_FONT_TTF_LIBERATION_FONTDIR) # ---------------------------------------------------------------------------- # Compile @@ -53,6 +45,18 @@ $(STATEDIR)/xorg-font-ttf-liberation.compile: $(STATEDIR)/xorg-font-ttf-liberation.install: @$(call targetinfo) + + @rm -rf $(XORG_FONT_TTF_LIBERATION_PKGDIR) + @mkdir -p $(XORG_FONT_TTF_LIBERATION_FONTPKGDIR) + @find $(XORG_FONT_TTF_LIBERATION_DIR) \ + -name "*.ttf" \ + | \ + while read file; do \ + install -m 644 $${file} $(XORG_FONT_TTF_LIBERATION_FONTPKGDIR); \ + done + @mkfontscale $(XORG_FONT_TTF_LIBERATION_FONTPKGDIR) + @mkfontdir $(XORG_FONT_TTF_LIBERATION_FONTPKGDIR) + @$(call touch) # ---------------------------------------------------------------------------- @@ -62,14 +66,25 @@ $(STATEDIR)/xorg-font-ttf-liberation.install: $(STATEDIR)/xorg-font-ttf-liberation.targetinstall: @$(call targetinfo) - mkdir -p $(XORG_FONTS_DIR_INSTALL)/truetype + @$(call install_init, xorg-font-ttf-liberation) + @$(call install_fixup, xorg-font-ttf-liberation,PRIORITY,optional) + @$(call install_fixup, xorg-font-ttf-liberation,SECTION,base) + @$(call install_fixup, xorg-font-ttf-liberation,AUTHOR,"Florian Bäuerle <[email protected]>") + @$(call install_fixup, xorg-font-ttf-liberation,DESCRIPTION,missing) - find $(XORG_FONT_TTF_LIBERATION_DIR) \ - -name "*.ttf" \ - | \ - while read file; do \ - install -m 644 $${file} $(XORG_FONTS_DIR_INSTALL)/truetype; \ + @$(call install_tree, xorg-font-ttf-liberation, 0, 0, -, $(XORG_FONT_TTF_LIBERATION_FONTDIR)) + +ifdef PTXCONF_XORG_FONTS_QT4_LINKS + @cd $(XORG_FONT_TTF_LIBERATION_PKGDIR) && \ + find . -type f -name "*.ttf" | while read file; do \ + name=$$(basename $$file); \ + $(call install_link, xorg-font-ttf-liberation, \ + ../../..$(XORG_FONT_TTF_LIBERATION_FONTDIR)/$$name, \ + /usr/lib/fonts/$$name); \ done +endif + + @$(call install_finish, xorg-font-ttf-liberation) @$(call touch) -- 2.18.0 _______________________________________________ ptxdist mailing list [email protected]
