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>

diff --git a/share/mk/build/fonts/_.mk b/share/mk/build/fonts/_.mk
index 8b456453edcce6bd7877e977571ea417d0ca4593..2a6ae69950095ca66409427d78441cd4220607d9 100644 (file)
--- 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
similarity index 100%
rename from share/mk/build/fonts/TINOR
rename to 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 (file)
index 0000000..e230c82
--- /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 (file)
index 0000000..3320c97
--- /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 2b93e84ecca55a43c1c34f5446509fa3c97bbd4e..7cf122fc16caeb9d8dd3893622c06e95e3887a91 100644 (file)
--- 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 51d0a7d698ece209a9916a69ab5e0c11b77e3e10..bbaed09b667ca22f4dd3b3808f900de2e06e7e1e 100644 (file)
--- 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 \