From: Alejandro Colomar <alx@kernel.org>
To: linux-man@vger.kernel.org
Cc: branden@debian.org, Deri James <deri@chuzzlewit.myzen.co.uk>,
Alejandro Colomar <alx@kernel.org>
Subject: [PATCH 2/2] share/mk/: Reorganize files for generating the PDF book
Date: Mon, 25 Mar 2024 14:36:15 +0100 [thread overview]
Message-ID: <20240325133031.56302-4-alx@kernel.org> (raw)
In-Reply-To: <20240325133031.56302-2-alx@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 3120 bytes --]
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
share/mk/build/pdf/{book.mk => book/_.mk} | 11 ++++++-----
.../LinuxManBook => share/mk/build/pdf/book}/an.tmac | 0
.../mk/build/pdf/book/front.roff | 0
.../mk/build/pdf/book}/prepare.pl | 0
share/mk/install/pdf/{pdf.mk => book.mk} | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
rename share/mk/build/pdf/{book.mk => book/_.mk} (83%)
rename {scripts/LinuxManBook => share/mk/build/pdf/book}/an.tmac (100%)
rename scripts/LinuxManBook/LMBfront.roff => share/mk/build/pdf/book/front.roff (100%)
rename {scripts/LinuxManBook => share/mk/build/pdf/book}/prepare.pl (100%)
rename share/mk/install/pdf/{pdf.mk => book.mk} (94%)
diff --git a/share/mk/build/pdf/book.mk b/share/mk/build/pdf/book/_.mk
similarity index 83%
rename from share/mk/build/pdf/book.mk
rename to share/mk/build/pdf/book/_.mk
index 21097fd0e..26027cb4c 100644
--- a/share/mk/build/pdf/book.mk
+++ b/share/mk/build/pdf/book/_.mk
@@ -20,7 +20,8 @@ include $(MAKEFILEDIR)/configure/build-depends/moreutils/sponge.mk
include $(MAKEFILEDIR)/configure/version.mk
-LMBDIR := $(CURDIR)/scripts/LinuxManBook
+MKBOOKDIR := $(MAKEFILEDIR)/build/pdf/book
+MKBOOK := $(wildcard $(MKBOOKDIR)/*)
PDF_BOOK := $(DISTNAME).pdf
@@ -28,12 +29,12 @@ _PDFDIR := $(builddir)
_PDF_BOOK := $(_PDFDIR)/$(PDF_BOOK)
-$(_PDF_BOOK): $(_MANPAGES) $(_TINOS) $(wildcard $(LMBDIR)/*) | $$(@D)/
+$(_PDF_BOOK): $(_MANPAGES) $(_TINOS) $(MKBOOK) $(MK) | $$(@D)/
$(info $(INFO_)GROPDF $@)
( \
- $(CAT) "$(LMBDIR)"/LMBfront.roff; \
- $(CAT) "$(LMBDIR)"/an.tmac; \
- "$(LMBDIR)"/prepare.pl "$(_MANDIR)"; \
+ $(CAT) $(MKBOOKDIR)/front.roff; \
+ $(CAT) $(MKBOOKDIR)/an.tmac; \
+ $(MKBOOKDIR)/prepare.pl $(_MANDIR); \
) \
| $(PRECONV) \
| $(PIC) \
diff --git a/scripts/LinuxManBook/an.tmac b/share/mk/build/pdf/book/an.tmac
similarity index 100%
rename from scripts/LinuxManBook/an.tmac
rename to share/mk/build/pdf/book/an.tmac
diff --git a/scripts/LinuxManBook/LMBfront.roff b/share/mk/build/pdf/book/front.roff
similarity index 100%
rename from scripts/LinuxManBook/LMBfront.roff
rename to share/mk/build/pdf/book/front.roff
diff --git a/scripts/LinuxManBook/prepare.pl b/share/mk/build/pdf/book/prepare.pl
similarity index 100%
rename from scripts/LinuxManBook/prepare.pl
rename to share/mk/build/pdf/book/prepare.pl
diff --git a/share/mk/install/pdf/pdf.mk b/share/mk/install/pdf/book.mk
similarity index 94%
rename from share/mk/install/pdf/pdf.mk
rename to share/mk/install/pdf/book.mk
index 58aba1c5f..083bce2ae 100644
--- a/share/mk/install/pdf/pdf.mk
+++ b/share/mk/install/pdf/book.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_INSTALL_PDF_BOOK_INCLUDED
MAKEFILE_INSTALL_PDF_BOOK_INCLUDED := 1
-include $(MAKEFILEDIR)/build/pdf/book.mk
+include $(MAKEFILEDIR)/build/pdf/book/_.mk
include $(MAKEFILEDIR)/configure/build-depends/coreutils/install.mk
include $(MAKEFILEDIR)/configure/directory_variables/install.mk
--
2.43.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
prev parent reply other threads:[~2024-03-25 13:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 13:35 [PATCH 1/2] share/mk/: Generate the fonts during the build Alejandro Colomar
2024-03-25 13:36 ` Alejandro Colomar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240325133031.56302-4-alx@kernel.org \
--to=alx@kernel.org \
--cc=branden@debian.org \
--cc=deri@chuzzlewit.myzen.co.uk \
--cc=linux-man@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).