share/mk/: build-pdf*, install-pdf*: Rename targets for consistency

Signed-off-by: Alejandro Colomar <alx@kernel.org>

10 files changed, 88 insertions, 60 deletions

diff --git a/share/mk/build/_.mk b/share/mk/build/_.mk
index 4c815461c..e2d3f2488 100644
--- a/share/mk/build/_.mk
+++ b/share/mk/build/_.mk
@@ -14,7 +14,6 @@ _MANDIR := $(builddir)/man
 
 .PHONY: build
 build: \
-	build-book \
 	build-catman \
 	build-html \
 	build-pdf \
diff --git a/share/mk/build/pdf/_.mk b/share/mk/build/pdf/_.mk
index f6660aa51..65083a061 100644
--- a/share/mk/build/pdf/_.mk
+++ b/share/mk/build/pdf/_.mk
@@ -7,7 +7,7 @@ MAKEFILE_BUILD_PDF_INCLUDED := 1
 
 
 .PHONY: build-pdf
-build-pdf: build-pdf-gropdf;
+build-pdf: build-pdf-book build-pdf-pages;
 
 
 endif  # include guard
diff --git a/share/mk/build/book.mk b/share/mk/build/pdf/book.mk
index 5b2bf0ef6..7566f0043 100644
--- a/share/mk/build/book.mk
+++ b/share/mk/build/pdf/book.mk
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
-ifndef MAKEFILE_BUILD_BOOK_INCLUDED
-MAKEFILE_BUILD_BOOK_INCLUDED := 1
+ifndef MAKEFILE_BUILD_PDF_BOOK_INCLUDED
+MAKEFILE_BUILD_PDF_BOOK_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/_.mk
@@ -22,12 +22,12 @@ include $(MAKEFILEDIR)/configure/version.mk
 LMBDIR   := $(CURDIR)/scripts/LinuxManBook
 
 
-BOOK      := $(DISTNAME).pdf
-_BOOKDIR  := $(builddir)
-_BOOK     := $(_BOOKDIR)/$(BOOK)
+PDF_BOOK  := $(DISTNAME).pdf
+_PDFDIR   := $(builddir)
+_PDF_BOOK := $(_PDFDIR)/$(PDF_BOOK)
 
 
-$(_BOOK): $(_MANPAGES) $(wildcard $(LMBDIR)/* $(LMBDIR)/*/*) | $$(@D)/
+$(_PDF_BOOK): $(_MANPAGES) $(wildcard $(LMBDIR)/* $(LMBDIR)/*/*) | $$(@D)/
 	$(info	$(INFO_)GROPDF		$@)
 	( \
 		$(CAT) "$(LMBDIR)"/LMBfront.roff; \
@@ -43,8 +43,8 @@ $(_BOOK): $(_MANPAGES) $(wildcard $(LMBDIR)/* $(LMBDIR)/*/*) | $$(@D)/
 	| $(SPONGE) $@
 
 
-.PHONY: build-book
-build-book: $(_BOOK);
+.PHONY: build-pdf-book
+build-pdf-book: $(_PDF_BOOK);
 
 
 endif  # include guard
diff --git a/share/mk/build/pdf/pages/_.mk b/share/mk/build/pdf/pages/_.mk
new file mode 100644
index 000000000..0885039ab
--- /dev/null
+++ b/share/mk/build/pdf/pages/_.mk
@@ -0,0 +1,13 @@
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_BUILD_PDF_PAGES_INCLUDED
+MAKEFILE_BUILD_PDF_PAGES_INCLUDED := 1
+
+
+.PHONY: build-pdf-pages
+build-pdf-pages: build-pdf-pages-gropdf;
+
+
+endif  # include guard
diff --git a/share/mk/build/pdf/eqn.mk b/share/mk/build/pdf/pages/eqn.mk
index 5760fa7ee..aedf4cfa6 100644
--- a/share/mk/build/pdf/eqn.mk
+++ b/share/mk/build/pdf/pages/eqn.mk
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
-ifndef MAKEFILE_BUILD_PDF_EQN_INCLUDED
-MAKEFILE_BUILD_PDF_EQN_INCLUDED := 1
+ifndef MAKEFILE_BUILD_PDF_PAGES_EQN_INCLUDED
+MAKEFILE_BUILD_PDF_PAGES_EQN_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/pre/tbl.mk
@@ -20,8 +20,8 @@ $(_PDFMAN_troff): %.pdf.troff: %.eqn $(MK) | $$(@D)/
 	| $(GREP) ^ >&2
 
 
-.PHONY: build-pdf-eqn
-build-pdf-eqn: $(_PDFMAN_troff);
+.PHONY: build-pdf-pages-eqn
+build-pdf-pages-eqn: $(_PDFMAN_troff);
 
 
 endif  # include guard
diff --git a/share/mk/build/pdf/gropdf.mk b/share/mk/build/pdf/pages/gropdf.mk
index f921cc96a..aaf06f40b 100644
--- a/share/mk/build/pdf/gropdf.mk
+++ b/share/mk/build/pdf/pages/gropdf.mk
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
-ifndef MAKEFILE_BUILD_PDF_GROPDF_INCLUDED
-MAKEFILE_BUILD_PDF_GROPDF_INCLUDED := 1
+ifndef MAKEFILE_BUILD_PDF_PAGES_GROPDF_INCLUDED
+MAKEFILE_BUILD_PDF_PAGES_GROPDF_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/build/pdf/troff.mk
+include $(MAKEFILEDIR)/build/pdf/pages/troff.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff/gropdf.mk
 
 
@@ -18,8 +18,8 @@ $(_PDFMAN): %.pdf: %.pdf.set $(MK) | $$(@D)/
 	$(GROPDF) $(GROPDFFLAGS) <$< >$@
 
 
-.PHONY: build-pdf-gropdf
-build-pdf-gropdf: $(_PDFMAN);
+.PHONY: build-pdf-pages-gropdf
+build-pdf-pages-gropdf: $(_PDFMAN);
 
 
 endif  # include guard
diff --git a/share/mk/build/pdf/troff.mk b/share/mk/build/pdf/pages/troff.mk
index 54519df2d..a6a5e7e72 100644
--- a/share/mk/build/pdf/troff.mk
+++ b/share/mk/build/pdf/pages/troff.mk
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
-ifndef MAKEFILE_BUILD_PDF_TROFF_INCLUDED
-MAKEFILE_BUILD_PDF_TROFF_INCLUDED := 1
+ifndef MAKEFILE_BUILD_PDF_PAGES_TROFF_INCLUDED
+MAKEFILE_BUILD_PDF_PAGES_TROFF_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/_.mk
@@ -62,14 +62,14 @@ $(_PDFMAN_MDOC_set): %.pdf.set: %.pdf.troff $(MK) | $$(@D)/
 	| $(GREP) ^ >&2
 
 
-.PHONY: build-pdf-troff-man
-build-pdf-troff-man: $(_PDFMAN_MAN_set);
+.PHONY: build-pdf-pages-troff-man
+build-pdf-pages-troff-man: $(_PDFMAN_MAN_set);
 
-.PHONY: build-pdf-troff-mdoc
-build-pdf-troff-mdoc: $(_PDFMAN_MDOC_set);
+.PHONY: build-pdf-pages-troff-mdoc
+build-pdf-pages-troff-mdoc: $(_PDFMAN_MDOC_set);
 
-.PHONY: build-pdf-troff
-build-pdf-troff: build-pdf-troff-man build-pdf-troff-mdoc;
+.PHONY: build-pdf-pages-troff
+build-pdf-pages-troff: build-pdf-pages-troff-man build-pdf-pages-troff-mdoc;
 
 
 endif  # include guard
diff --git a/share/mk/install/pdf.mk b/share/mk/install/pdf.mk
deleted file mode 100644
index 40bf8c922..000000000
--- a/share/mk/install/pdf.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
-# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
-
-
-ifndef MAKEFILE_INSTALL_PDF_INCLUDED
-MAKEFILE_INSTALL_PDF_INCLUDED := 1
-
-
-include $(MAKEFILEDIR)/build/book.mk
-include $(MAKEFILEDIR)/configure/build-depends/coreutils/install.mk
-include $(MAKEFILEDIR)/configure/directory_variables/install.mk
-
-
-_pdfdir := $(DESTDIR)$(pdfdir)
-
-
-_pdf    := $(patsubst $(_BOOKDIR)/%,$(_pdfdir)/%,$(_BOOK))
-_pdf_rm := $(addsuffix -rm,$(wildcard $(_pdf)))
-
-
-$(_pdf): $(_pdfdir)/%: $(_BOOKDIR)/% $(MK) | $$(@D)/
-	$(info	$(INFO_)INSTALL		$@)
-	$(INSTALL_DATA) -T $< $@
-
-
-.PHONY: install-pdf
-install-pdf: $(_pdf);
-
-.PHONY: uninstall-pdf
-uninstall-pdf: $(_pdf_rm);
-
-
-endif  # include guard
diff --git a/share/mk/install/pdf/_.mk b/share/mk/install/pdf/_.mk
new file mode 100644
index 000000000..255925760
--- /dev/null
+++ b/share/mk/install/pdf/_.mk
@@ -0,0 +1,16 @@
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_INSTALL_PDF_INCLUDED
+MAKEFILE_INSTALL_PDF_INCLUDED := 1
+
+
+.PHONY: install-pdf
+install-pdf: install-pdf-book;
+
+.PHONY: uninstall-pdf
+uninstall-pdf: uninstall-pdf-book;
+
+
+endif  # include guard
diff --git a/share/mk/install/pdf/pdf.mk b/share/mk/install/pdf/pdf.mk
new file mode 100644
index 000000000..58aba1c5f
--- /dev/null
+++ b/share/mk/install/pdf/pdf.mk
@@ -0,0 +1,33 @@
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_INSTALL_PDF_BOOK_INCLUDED
+MAKEFILE_INSTALL_PDF_BOOK_INCLUDED := 1
+
+
+include $(MAKEFILEDIR)/build/pdf/book.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/install.mk
+include $(MAKEFILEDIR)/configure/directory_variables/install.mk
+
+
+_pdfdir := $(DESTDIR)$(pdfdir)
+
+
+_pdf_book    := $(patsubst $(_PDFDIR)/%,$(_pdfdir)/%,$(_PDF_BOOK))
+_pdf_book_rm := $(addsuffix -rm,$(wildcard $(_pdf_book)))
+
+
+$(_pdf_book): $(_pdfdir)/%: $(_PDFDIR)/% $(MK) | $$(@D)/
+	$(info	$(INFO_)INSTALL		$@)
+	$(INSTALL_DATA) -T $< $@
+
+
+.PHONY: install-pdf-book
+install-pdf-book: $(_pdf_book);
+
+.PHONY: uninstall-pdf-book
+uninstall-pdf-book: $(_pdf_book_rm);
+
+
+endif  # include guard