diff options
| author | Akira Yokosawa <akiyks@gmail.com> | 2023-06-15 18:49:45 +0900 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org> | 2023-06-15 09:25:34 -0700 |
| commit | e07c7b2315e061f1fcebc16a45843bae8b11594d (patch) | |
| tree | 5fefd92acf8f62034167a29e5c7e2f005271e249 | |
| parent | 62e761fc329db007948393234ce1500c15040795 (diff) | |
| download | perfbook-e07c7b2315e061f1fcebc16a45843bae8b11594d.tar.gz | |
Makefile: Add 'DejaVu Sans' to nice-to-have fonts
Under RHEL and Fedora, it is possible to install "DejaVu Sans Mono"
alone. Add check of "DejaVu Sans" font in Makefile and print info
on a nice-to-have font in case it is missing.
Update FAQ-BUILD.txt accordingly.
Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
| -rw-r--r-- | FAQ-BUILD.txt | 1 | ||||
| -rw-r--r-- | Makefile | 15 |
2 files changed, 13 insertions, 3 deletions
diff --git a/FAQ-BUILD.txt b/FAQ-BUILD.txt index 024f98bd..7c584c24 100644 --- a/FAQ-BUILD.txt +++ b/FAQ-BUILD.txt @@ -186,6 +186,7 @@ There are SVG figures which use other font families listed below: + - DejaVu Sans - DejaVu Sans Mono - FreeMono - Liberation Sans @@ -125,6 +125,7 @@ COURIERS := $(findstring couriers,$(FONTPACKAGES)) NEWTXSF := $(findstring newtxsf,$(FONTPACKAGES)) INCONSOLATA := $(findstring inconsolata,$(FONTPACKAGES)) FREESANS := $(shell fc-list | grep FreeSans | wc -l) +DEJAVUSANS := $(shell fc-list | grep "DejaVu Sans" | grep -v "DejaVu Sans Mono" | wc -l) DEJAVUMONO := $(shell fc-list | grep "DejaVu Sans Mono" | wc -l) LIBERATIONSANS := $(shell fc-list | grep "Liberation Sans" | wc -l) LIBERATINOMONO := $(shell fc-list | grep "Liberation Mono" | wc -l) @@ -149,10 +150,15 @@ ifeq ($(FREESANS),0) else RECOMMEND_FREEFONT := 0 endif +ifeq ($(DEJAVUSANS),0) + RECOMMEND_DEJAVUSANS := 1 +else + RECOMMEND_DEJAVUSANS := 0 +endif ifeq ($(DEJAVUMONO),0) - RECOMMEND_DEJAVU := 1 + RECOMMEND_DEJAVUMONO := 1 else - RECOMMEND_DEJAVU := 0 + RECOMMEND_DEJAVUMONO := 0 endif ifeq ($(LIBERATIONSANS),0) RECOMMEND_LIBERATIONSANS := 1 @@ -461,7 +467,10 @@ endif ifeq ($(RECOMMEND_FREEFONT),1) $(info Nice-to-have font family 'FreeMono' not found. See #9 in FAQ-BUILD.txt) endif -ifeq ($(RECOMMEND_DEJAVU),1) +ifeq ($(RECOMMEND_DEJAVUSANS),1) + $(info Nice-to-have font family 'DejaVu Sans' not found. See #9 in FAQ-BUILD.txt) +endif +ifeq ($(RECOMMEND_DEJAVUMONO),1) $(info Nice-to-have font family 'DejaVu Sans Mono' not found. See #9 in FAQ-BUILD.txt) endif ifeq ($(RECOMMEND_LIBERATIONSANS),1) |