From 4d19c6b7ad538032b9718635baa311394fd9b3b8 Mon Sep 17 00:00:00 2001
From: Tomas Jelinek <tojeline@redhat.com>
Date: Wed, 22 Feb 2017 13:17:22 +0100
Subject: [PATCH] fix linking fonts to pcsd
fc-list can return more than one font therefore the resulting symlink is
pointing to a wrong path. fc-match returns one best match.
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 443290ef..003c78c7 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ endif
$(foreach font,$(pcsd_fonts),\
$(eval font_file = $(word 1,$(subst ;, ,$(font)))) \
$(eval font_def = $(word 2,$(subst ;, ,$(font)))) \
- $(eval font_path = $(shell fc-list '--format=%{file}' '$(font_def)')) \
+ $(eval font_path = $(shell fc-match '--format=%{file}' '$(font_def)')) \
$(if $(font_path),ln -s -f $(font_path) ${DESTDIR}${PCSD_PARENT_DIR}/pcsd/public/css/$(font_file);,$(error Font $(font_def) not found)) \
)
--
2.11.0