1 From 7e99cf4ae3f38406133a4abf962527cd02416f8e Mon Sep 17 00:00:00 2001
2 From: Sebastian Galkin <paraseba@gmail.com>
3 Date: Wed, 20 Dec 2017 18:23:03 -0200
4 Subject: [PATCH] put fonts in $out
7 Makefile.conf | 22 ++++------------------
8 configure | 12 ------------
9 2 files changed, 4 insertions(+), 30 deletions(-)
11 diff --git a/Makefile.conf b/Makefile.conf
12 index e7f8de9..87f3fff 100644
15 @@ -226,19 +226,11 @@ install_scid: all_scid
17 install -m 755 -d $(SHAREDIR)/bitmaps
18 cp -r ./bitmaps/* $(SHAREDIR)/bitmaps/
19 - @if [ "`id -u`" -eq 0 ]; then \
20 - install -m 755 -d $(FONTDIR); \
21 - install -m 644 -p fonts/*.ttf $(FONTDIR); \
23 - install -m 755 -d ~/.fonts; \
24 - install -m 644 -p fonts/*.ttf ~/.fonts; \
26 + install -m 755 -d $(FONTDIR); \
27 + install -m 644 -p fonts/*.ttf $(FONTDIR); \
29 @if [ ! -z "`which fc-cache`" ]; then \
30 - if [ "`id -u`" -eq 0 ]; then \
31 - fc-cache -fv $(FONTDIR); \
33 - fc-cache -fv ~/.fonts; \
35 + fc-cache -fv $(FONTDIR); \
37 echo "Don't know how to setup truetype fonts (fc-cache not available)."; \
38 echo "Please contact your system administrator."; \
39 @@ -292,12 +284,6 @@ uninstall:
40 for f in `ls fonts/*.ttf`; do \
43 - if [ ! -z "`which fc-cache`" ]; then \
44 - fc-cache -fv ~/.fonts; \
46 - if [ "`find ~/.fonts -type d -empty`" = "`ls -d ~/.fonts`" ]; then \
52 diff --git a/configure b/configure
53 index 4599c77..8b09678 100755
56 @@ -473,18 +473,6 @@ proc writeMakefile {{type ""}} {
61 - set var(FONTDIR) /Library/Fonts/
63 - # Just install fonts in to /usr irrespective of system prefix. /usr/local may not be active
65 - if {![file isdirectory $prefix/share/fonts]} {
66 - set var(FONTDIR) "~/.fonts"
68 - set var(FONTDIR) $prefix/share/fonts/truetype/Scid