diff options
| author | Alejandro Colomar <alx@kernel.org> | 2024-03-12 18:45:42 +0100 |
|---|---|---|
| committer | Alejandro Colomar <alx@kernel.org> | 2024-03-14 16:57:39 +0100 |
| commit | 4af509c34f202b102c0f6e0314633e1cbcd119dc (patch) | |
| tree | ddd7db3439017cb6a45e963978357b19593f7d72 | |
| parent | a4ea5f76215dcf1d8d017eb65ab12919ccf09f3f (diff) | |
scripts/LinuxManBook/build.sh, share/mk/: Use command variables
Signed-off-by: Alejandro Colomar <alx@kernel.org>
| -rwxr-xr-x | scripts/LinuxManBook/build.sh | 30 | ||||
| -rw-r--r-- | share/mk/build/book.mk | 10 | ||||
| -rw-r--r-- | share/mk/configure/build-depends/coreutils.mk | 1 | ||||
| -rw-r--r-- | share/mk/configure/build-depends/groff-base.mk | 6 |
4 files changed, 37 insertions, 10 deletions
diff --git a/scripts/LinuxManBook/build.sh b/scripts/LinuxManBook/build.sh index 8e373c073..fcb8b8362 100755 --- a/scripts/LinuxManBook/build.sh +++ b/scripts/LinuxManBook/build.sh @@ -1,15 +1,25 @@ -#!/bin/sh -# Copyright 2023, Alejandro Colomar <alx@kernel.org> +#!/usr/bin/env -Sbash +# Copyright 2023-2024, Alejandro Colomar <alx@kernel.org> # SPDX-License-Identifier: GPL-3.0-or-later + +test -v CAT || CAT=cat; +test -v PRECONV || PRECONV=preconv; +test -v PIC || PIC=pic; +test -v TBL || TBL=tbl; +test -v EQN || EQN=eqn; +test -v TROFF || TROFF=troff; +test -v GROPDF || GROPDF=gropdf; + + ( - cat "$(dirname "$0")"/LMBfront.roff; - cat "$(dirname "$0")"/an.tmac; + $CAT "$(dirname "$0")"/LMBfront.roff; + $CAT "$(dirname "$0")"/an.tmac; "$(dirname "$0")"/prepare.pl "$1"; ) \ -| preconv \ -| pic \ -| tbl \ -| eqn -Tpdf \ -| troff -Tpdf -F"$(dirname "$0")" -dpaper=a4 \ -| gropdf -F"$(dirname "$0")" -pa4; +| $PRECONV \ +| $PIC \ +| $TBL \ +| $EQN -Tpdf \ +| $TROFF -Tpdf -F"$(dirname "$0")" -dpaper=a4 \ +| $GROPDF -F"$(dirname "$0")" -pa4; diff --git a/share/mk/build/book.mk b/share/mk/build/book.mk index 63788e345..bf9e663e6 100644 --- a/share/mk/build/book.mk +++ b/share/mk/build/book.mk @@ -9,6 +9,9 @@ MAKEFILE_BUILD_BOOK_INCLUDED := 1 include $(MAKEFILEDIR)/build/_.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk +include $(MAKEFILEDIR)/configure/build-depends/groff.mk +include $(MAKEFILEDIR)/configure/build-depends/groff-base.mk include $(MAKEFILEDIR)/configure/build-depends/moreutils.mk include $(MAKEFILEDIR)/configure/src.mk include $(MAKEFILEDIR)/src.mk @@ -23,6 +26,13 @@ _LMB := $(_MANDIR)/man-pages.pdf $(_LMB): $(MANPAGES) $(wildcard $(LMBDIR)/* $(LMBDIR)/*/*) | $$(@D)/ $(info $(INFO_)Build $@) + CAT='$(CAT)' \ + PRECONV='$(PRECONV)' \ + PIC='$(PIC)' \ + TBL='$(TBL)' \ + EQN='$(EQN)' \ + TROFF='$(TROFF)' \ + GROPDF='$(GROPDF)' \ $(BUILDLMB) $(MANDIR) \ | $(SPONGE) $@ diff --git a/share/mk/configure/build-depends/coreutils.mk b/share/mk/configure/build-depends/coreutils.mk index f94800cf7..b9247c5dc 100644 --- a/share/mk/configure/build-depends/coreutils.mk +++ b/share/mk/configure/build-depends/coreutils.mk @@ -6,6 +6,7 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_INCLUDED MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_INCLUDED := 1 +CAT := cat CP := cp ECHO := echo EXPR := expr diff --git a/share/mk/configure/build-depends/groff-base.mk b/share/mk/configure/build-depends/groff-base.mk index d118b2c02..9b29b631c 100644 --- a/share/mk/configure/build-depends/groff-base.mk +++ b/share/mk/configure/build-depends/groff-base.mk @@ -18,6 +18,12 @@ PRECONVFLAGS := $(DEFAULT_PRECONVFLAGS) $(EXTRA_PRECONVFLAGS) PRECONV := preconv +DEFAULT_PICFLAGS := +EXTRA_PICFLAGS := +PICFLAGS := $(DEFAULT_PICFLAGS) $(EXTRA_PICFLAGS) +PIC := pic + + TBL := tbl |