diff options
| author | Alejandro Colomar <alx@kernel.org> | 2024-04-16 22:04:52 +0200 |
|---|---|---|
| committer | Alejandro Colomar <alx@kernel.org> | 2024-04-17 17:43:26 +0200 |
| commit | a4f3afd282ae57112d0301cd14a4e5b4e5f40456 (patch) | |
| tree | ff5ee9d4fb343438a2ee62da8739d62142f35852 | |
| parent | 64cdc974801b2a4f6ca78449a23c756fcba047c9 (diff) | |
share/mk/: build-fonts: Use $FONTSDIR/devpdf/, and add the download file
See gropdf(1).
Reported-by: Deri <deri@chuzzlewit.myzen.co.uk>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
| -rw-r--r-- | share/mk/build/fonts/_.mk | 2 | ||||
| -rw-r--r-- | share/mk/build/fonts/devpdf/TINOR (renamed from share/mk/build/fonts/TINOR) | 0 | ||||
| -rw-r--r-- | share/mk/build/fonts/devpdf/download | 1 | ||||
| -rw-r--r-- | share/mk/build/fonts/download.mk | 26 | ||||
| -rw-r--r-- | share/mk/build/fonts/tinos.mk | 6 | ||||
| -rw-r--r-- | share/mk/build/pdf/book/_.mk | 2 |
6 files changed, 32 insertions, 5 deletions
diff --git a/share/mk/build/fonts/_.mk b/share/mk/build/fonts/_.mk index 8b456453e..2a6ae6995 100644 --- a/share/mk/build/fonts/_.mk +++ b/share/mk/build/fonts/_.mk @@ -15,7 +15,7 @@ _FONTSDIR := $(builddir)/fonts .PHONY: build-fonts -build-fonts: build-fonts-tinos +build-fonts: build-fonts-download build-fonts-tinos endif # include guard diff --git a/share/mk/build/fonts/TINOR b/share/mk/build/fonts/devpdf/TINOR index 94d2fb443..94d2fb443 100644 --- a/share/mk/build/fonts/TINOR +++ b/share/mk/build/fonts/devpdf/TINOR diff --git a/share/mk/build/fonts/devpdf/download b/share/mk/build/fonts/devpdf/download new file mode 100644 index 000000000..e230c8213 --- /dev/null +++ b/share/mk/build/fonts/devpdf/download @@ -0,0 +1 @@ + Tinos Tinos.pfa diff --git a/share/mk/build/fonts/download.mk b/share/mk/build/fonts/download.mk new file mode 100644 index 000000000..3320c97ed --- /dev/null +++ b/share/mk/build/fonts/download.mk @@ -0,0 +1,26 @@ +# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_BUILD_FONTS_DOWNLOAD_INCLUDED +MAKEFILE_BUILD_FONTS_DOWNLOAD_INCLUDED := 1 + + +include $(MAKEFILEDIR)/build/fonts/_.mk + + +DOWNLOAD := $(MAKEFILEDIR)/build/fonts/devpdf/download + +_DOWNLOAD := $(_FONTSDIR)/devpdf/download + + +$(_DOWNLOAD): $(_FONTSDIR)/%: $(MAKEFILEDIR)/build/fonts/% $(MK) | $$(@D)/ + $(info $(INFO_)CP $@) + $(CP) -T $< $@ + + +.PHONY: build-fonts-download +build-fonts-download: $(_DOWNLOAD) + + +endif # include guard diff --git a/share/mk/build/fonts/tinos.mk b/share/mk/build/fonts/tinos.mk index 2b93e84ec..7cf122fc1 100644 --- a/share/mk/build/fonts/tinos.mk +++ b/share/mk/build/fonts/tinos.mk @@ -11,11 +11,11 @@ include $(MAKEFILEDIR)/configure/build-depends/texlive-fonts-extra/Tinos.pfb.mk include $(MAKEFILEDIR)/configure/build-depends/groff/pfbtops.mk -TINOR := $(MAKEFILEDIR)/build/fonts/TINOR +TINOR := $(MAKEFILEDIR)/build/fonts/devpdf/TINOR -_TINOS_PFA := $(_FONTSDIR)/Tinos.pfa -_TINOR := $(_FONTSDIR)/TINOR +_TINOS_PFA := $(_FONTSDIR)/devpdf/Tinos.pfa +_TINOR := $(_FONTSDIR)/devpdf/TINOR _TINOS := $(_TINOS_PFA) $(_TINOR) diff --git a/share/mk/build/pdf/book/_.mk b/share/mk/build/pdf/book/_.mk index 51d0a7d69..bbaed09b6 100644 --- a/share/mk/build/pdf/book/_.mk +++ b/share/mk/build/pdf/book/_.mk @@ -30,7 +30,7 @@ _PDFDIR := $(builddir) _PDF_BOOK := $(_PDFDIR)/$(PDF_BOOK) -$(_PDF_BOOK): $(_MANPAGES) $(_TINOS) $(MKBOOK) $(MK) | $$(@D)/ +$(_PDF_BOOK): $(_MANPAGES) $(_DOWNLOAD) $(_TINOS) $(MKBOOK) $(MK) | $$(@D)/ $(info $(INFO_)GROPDF $@) $(MKBOOKDIR)/prepare.pl $(_MANDIR) \ | $(CAT) $(MKBOOKDIR)/front.roff /dev/stdin \ |