aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <alx@kernel.org>2024-02-22 11:52:39 +0100
committerAlejandro Colomar <alx@kernel.org>2024-02-25 10:50:45 +0100
commitd965e7374de4c683e9816efc197d304589d04a81 (patch)
tree6694c39d4ccadcf1d66da969d7296c7f063d9810
parent72b372cf7a4890128980cfa2828aeb22b5ae1e56 (diff)
downloadman-pages-d965e7374de4c683e9816efc197d304589d04a81.tar.gz
share/mk/: Use a variable to prefix recursive make(1) output
Piping the output to sed(1) didn't behave well with -Orecurse. Using a variable behaves well, keeping output synchronized. The length of the variable name is specific, so that `$(INFO_)` uses exactly 8 characters, a tab. Signed-off-by: Alejandro Colomar <alx@kernel.org>
-rw-r--r--GNUmakefile311
-rw-r--r--share/mk/build/book.mk2
-rw-r--r--share/mk/build/catman/eqn.mk2
-rw-r--r--share/mk/build/catman/grotty.mk2
-rw-r--r--share/mk/build/catman/troff.mk4
-rw-r--r--share/mk/build/examples/_.mk2
-rw-r--r--share/mk/build/examples/cc.mk2
-rw-r--r--share/mk/build/examples/ld.mk2
-rw-r--r--share/mk/build/examples/src.mk2
-rw-r--r--share/mk/build/html.mk2
-rw-r--r--share/mk/build/pdf/eqn.mk2
-rw-r--r--share/mk/build/pdf/gropdf.mk2
-rw-r--r--share/mk/build/pdf/troff.mk4
-rw-r--r--share/mk/build/pre/preconv.mk2
-rw-r--r--share/mk/build/pre/tbl.mk2
-rw-r--r--share/mk/build/ps/eqn.mk2
-rw-r--r--share/mk/build/ps/grops.mk2
-rw-r--r--share/mk/build/ps/troff.mk4
-rw-r--r--share/mk/check/catman/col.mk2
-rw-r--r--share/mk/check/catman/grep.mk2
-rw-r--r--share/mk/clean.mk6
-rw-r--r--share/mk/dist/_.mk2
-rw-r--r--share/mk/dist/check/all.mk5
-rw-r--r--share/mk/dist/check/build.mk53
-rw-r--r--share/mk/dist/check/check.mk13
-rw-r--r--share/mk/dist/check/diffoscope.mk2
-rw-r--r--share/mk/dist/check/dist.mk4
-rw-r--r--share/mk/dist/check/install.mk4
-rw-r--r--share/mk/dist/check/lint.mk16
-rw-r--r--share/mk/dist/check/tar.mk4
-rw-r--r--share/mk/dist/files.mk6
-rw-r--r--share/mk/dist/tar.mk2
-rw-r--r--share/mk/dist/z.mk2
-rw-r--r--share/mk/install/_.mk4
-rw-r--r--share/mk/install/html.mk2
-rw-r--r--share/mk/install/man.mk2
-rw-r--r--share/mk/lint/c/checkpatch.mk2
-rw-r--r--share/mk/lint/c/clang-tidy.mk2
-rw-r--r--share/mk/lint/c/cppcheck.mk2
-rw-r--r--share/mk/lint/c/cpplint.mk2
-rw-r--r--share/mk/lint/c/iwyu.mk2
-rw-r--r--share/mk/lint/man/mandoc.mk2
-rw-r--r--share/mk/lint/man/tbl.mk2
-rw-r--r--share/mk/lint/mdoc/mandoc.mk2
44 files changed, 249 insertions, 249 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 21550ae7d2..830a30fc17 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -35,90 +35,93 @@ DATAROOTDIR := $(srcdir)/share
MAKEFILEDIR := $(DATAROOTDIR)/mk
+INFO_ :=
+
+
.PHONY: all
all: build;
.PHONY: help
help:
- $(info all Alias for "build")
- $(info )
- $(info clean Remove $$(builddir))
- $(info )
- $(info build Wrapper for build-* targets)
- $(info )
- $(info build-book Build the Linux Man Book (PDF))
- $(info )
- $(info build-pre Preprocess man pages; alias for "build-pre-tbl")
- $(info build-pre-preconv Preprocess man pages with preconv(1))
- $(info build-pre-tbl Preprocess man pages with tbl(1))
- $(info )
- $(info build-catman Build cat pages; alias for "build-catman-grotty")
- $(info build-catman-eqn eqn(1) step of "build-catman")
- $(info build-catman-troff Wrapper for build-catman-troff-* targets)
- $(info build-catman-troff-man troff(1) step of "build-catman" for man(7) pages)
- $(info build-catman-troff-mdoc troff(1) step of "build-catman" for mdoc(7) pages)
- $(info build-catman-grotty grotty(1) step of "build-catman")
- $(info )
- $(info build-html Build HTML manual pages)
- $(info html Alias for "build-html")
- $(info )
- $(info build-pdf Build PDF manual pages; alias for "build-pdf-grops")
- $(info build-pdf-eqn eqn(1) step of "build-pdf")
- $(info build-pdf-troff Wrapper for build-pdf-troff-* targets)
- $(info build-pdf-troff-man troff(1) step of "build-pdf" for man(7) pages)
- $(info build-pdf-troff-mdoc troff(1) step of "build-pdf" for mdoc(7) pages)
- $(info build-pdf-gropdf gropdf(1) step of "build-pdf")
- $(info )
- $(info build-ps Build PostScript manual pages; alias for "build-ps-grops")
- $(info build-ps-eqn eqn(1) step of "build-ps")
- $(info build-ps-troff Wrapper for build-ps-troff-* targets)
- $(info build-ps-troff-man troff(1) step of "build-ps" for man(7) pages)
- $(info build-ps-troff-mdoc troff(1) step of "build-ps" for mdoc(7) pages)
- $(info build-ps-grops grops(1) step of "build-ps")
- $(info )
- $(info build-src Alias for "build-src-ld")
- $(info build-src-c Extract C programs from EXAMPLES)
- $(info build-src-cc Compile C programs from EXAMPLES)
- $(info build-src-ld Link C programs from EXAMPLES)
- $(info )
- $(info lint Wrapper for "lint-c lint-man lint-mdoc")
- $(info lint-c Wrapper for lint-c-* targets)
- $(info lint-c-checkpatch Lint C programs from EXAMPLES with checkpatch(1))
- $(info lint-c-clang-tidy Lint C programs from EXAMPLES with clang-tidy(1))
- $(info lint-c-cppcheck Lint C programs from EXAMPLES with cppcheck(1))
- $(info lint-c-cpplint Lint C programs from EXAMPLES with cpplint(1))
- $(info lint-c-iwyu Lint C programs from EXAMPLES with iwyu(1))
- $(info lint-man Wrapper for lint-man-* targets)
- $(info lint-man-mandoc Lint man(7) pages with mandoc(1))
- $(info lint-man-tbl Lint man(7) pages about '\" t' comment for tbl(1))
- $(info lint-mdoc Wrapper for lint-mdoc-* targets)
- $(info lint-mdoc-mandoc Lint mdoc(7) pages with mandoc(1))
- $(info )
- $(info check Alias for "check-catman")
- $(info check-catman Check cat pages; alias for "check-catman-grep")
- $(info check-catman-col Filter cat pages with col(1))
- $(info check-catman-grep Check cat pages with grep(1))
- $(info )
- $(info [un]install Alias for "[un]install-man")
- $(info [un]install-man Wrapper for [un]install-man* targets)
- $(info [un]install-manintro [Un]install intro(*) man pages)
- $(info [un]install-man{1,...} [Un]install man pages in the corresponding section)
- $(info )
- $(info [un]install-html [Un]install HTML manual pages)
- $(info )
- $(info dist Wrapper for dist-* targets)
- $(info dist-tar Create a tarball of the repository)
- $(info dist-z Wrapper for dist-z-* targets)
- $(info dist-z-bz2 Create a compressed tarball (.tar.bz2))
- $(info dist-z-gz Create a compressed tarball (.tar.gz))
- $(info dist-z-lz Create a compressed tarball (.tar.lz))
- $(info dist-z-xz Create a compressed tarball (.tar.xz))
- $(info distcheck Check the distribution tarball)
- $(info )
- $(info help Print this help)
- $(info help-variables Print all variables available, and their default values)
- $(info )
- $(info nothing Make nothing. It's useful for debug purposes)
+ $(info $(INFO_)all Alias for "build")
+ $(info )
+ $(info $(INFO_)clean Remove $$(builddir))
+ $(info )
+ $(info $(INFO_)build Wrapper for build-* targets)
+ $(info )
+ $(info $(INFO_)build-book Build the Linux Man Book (PDF))
+ $(info )
+ $(info $(INFO_)build-pre Preprocess man pages; alias for "build-pre-tbl")
+ $(info $(INFO_)build-pre-preconv Preprocess man pages with preconv(1))
+ $(info $(INFO_)build-pre-tbl Preprocess man pages with tbl(1))
+ $(info )
+ $(info $(INFO_)build-catman Build cat pages; alias for "build-catman-grotty")
+ $(info $(INFO_)build-catman-eqn eqn(1) step of "build-catman")
+ $(info $(INFO_)build-catman-troff Wrapper for build-catman-troff-* targets)
+ $(info $(INFO_)build-catman-troff-man troff(1) step of "build-catman" for man(7) pages)
+ $(info $(INFO_)build-catman-troff-mdoc troff(1) step of "build-catman" for mdoc(7) pages)
+ $(info $(INFO_)build-catman-grotty grotty(1) step of "build-catman")
+ $(info )
+ $(info $(INFO_)build-html Build HTML manual pages)
+ $(info $(INFO_)html Alias for "build-html")
+ $(info )
+ $(info $(INFO_)build-pdf Build PDF manual pages; alias for "build-pdf-grops")
+ $(info $(INFO_)build-pdf-eqn eqn(1) step of "build-pdf")
+ $(info $(INFO_)build-pdf-troff Wrapper for build-pdf-troff-* targets)
+ $(info $(INFO_)build-pdf-troff-man troff(1) step of "build-pdf" for man(7) pages)
+ $(info $(INFO_)build-pdf-troff-mdoc troff(1) step of "build-pdf" for mdoc(7) pages)
+ $(info $(INFO_)build-pdf-gropdf gropdf(1) step of "build-pdf")
+ $(info )
+ $(info $(INFO_)build-ps Build PostScript manual pages; alias for "build-ps-grops")
+ $(info $(INFO_)build-ps-eqn eqn(1) step of "build-ps")
+ $(info $(INFO_)build-ps-troff Wrapper for build-ps-troff-* targets)
+ $(info $(INFO_)build-ps-troff-man troff(1) step of "build-ps" for man(7) pages)
+ $(info $(INFO_)build-ps-troff-mdoc troff(1) step of "build-ps" for mdoc(7) pages)
+ $(info $(INFO_)build-ps-grops grops(1) step of "build-ps")
+ $(info )
+ $(info $(INFO_)build-src Alias for "build-src-ld")
+ $(info $(INFO_)build-src-c Extract C programs from EXAMPLES)
+ $(info $(INFO_)build-src-cc Compile C programs from EXAMPLES)
+ $(info $(INFO_)build-src-ld Link C programs from EXAMPLES)
+ $(info )
+ $(info $(INFO_)lint Wrapper for "lint-c lint-man lint-mdoc")
+ $(info $(INFO_)lint-c Wrapper for lint-c-* targets)
+ $(info $(INFO_)lint-c-checkpatch Lint C programs from EXAMPLES with checkpatch(1))
+ $(info $(INFO_)lint-c-clang-tidy Lint C programs from EXAMPLES with clang-tidy(1))
+ $(info $(INFO_)lint-c-cppcheck Lint C programs from EXAMPLES with cppcheck(1))
+ $(info $(INFO_)lint-c-cpplint Lint C programs from EXAMPLES with cpplint(1))
+ $(info $(INFO_)lint-c-iwyu Lint C programs from EXAMPLES with iwyu(1))
+ $(info $(INFO_)lint-man Wrapper for lint-man-* targets)
+ $(info $(INFO_)lint-man-mandoc Lint man(7) pages with mandoc(1))
+ $(info $(INFO_)lint-man-tbl Lint man(7) pages about '\" t' comment for tbl(1))
+ $(info $(INFO_)lint-mdoc Wrapper for lint-mdoc-* targets)
+ $(info $(INFO_)lint-mdoc-mandoc Lint mdoc(7) pages with mandoc(1))
+ $(info )
+ $(info $(INFO_)check Alias for "check-catman")
+ $(info $(INFO_)check-catman Check cat pages; alias for "check-catman-grep")
+ $(info $(INFO_)check-catman-col Filter cat pages with col(1))
+ $(info $(INFO_)check-catman-grep Check cat pages with grep(1))
+ $(info )
+ $(info $(INFO_)[un]install Alias for "[un]install-man")
+ $(info $(INFO_)[un]install-man Wrapper for [un]install-man* targets)
+ $(info $(INFO_)[un]install-manintro [Un]install intro(*) man pages)
+ $(info $(INFO_)[un]install-man{1,...} [Un]install man pages in the corresponding section)
+ $(info )
+ $(info $(INFO_)[un]install-html [Un]install HTML manual pages)
+ $(info )
+ $(info $(INFO_)dist Wrapper for dist-* targets)
+ $(info $(INFO_)dist-tar Create a tarball of the repository)
+ $(info $(INFO_)dist-z Wrapper for dist-z-* targets)
+ $(info $(INFO_)dist-z-bz2 Create a compressed tarball (.tar.bz2))
+ $(info $(INFO_)dist-z-gz Create a compressed tarball (.tar.gz))
+ $(info $(INFO_)dist-z-lz Create a compressed tarball (.tar.lz))
+ $(info $(INFO_)dist-z-xz Create a compressed tarball (.tar.xz))
+ $(info $(INFO_)distcheck Check the distribution tarball)
+ $(info )
+ $(info $(INFO_)help Print this help)
+ $(info $(INFO_)help-variables Print all variables available, and their default values)
+ $(info )
+ $(info $(INFO_)nothing Make nothing. It's useful for debug purposes)
$(info )
@@ -133,81 +136,81 @@ $(MK):: ;
.PHONY: help-variables
help-variables:
- $(info LINK_PAGES How to install link pages. [".so", "symlink"])
- $(info Z Install pages compressed. ["", ".bz2", ".gz", ".lz", ".xz"])
- $(info )
- $(info DISTNAME $$(git describe))
- $(info DISTVERSION /$$DISTNAME/s/man-pages-//)
- $(info )
- $(info HIDE_ERR Define to empty string to debug some errors)
- $(info )
- $(info # Directory variables:)
- $(info )
- $(info builddir .tmp)
- $(info DESTDIR )
- $(info prefix /usr/local)
- $(info mandir $$(datarootdir)/man)
- $(info docdir $$(datarootdir)/doc)
- $(info )
- $(info man{1,...}dir $$(mandir)/man{1,...})
- $(info man{1,...}ext .{1,...})
- $(info )
- $(info htmldir $$(docdir))
- $(info htmlext .html)
- $(info )
- $(info # Command variables (and flags):)
- $(info )
- $(info - MANWIDTH)
- $(info - NROFF_OUT_DEVICE)
- $(info PRECONV {EXTRA_,}PRECONVFLAGS)
- $(info TBL)
- $(info EQN {EXTRA_,}EQNFLAGS)
- $(info TROFF {EXTRA_,}TROFFFLAGS{,_MAN,_MDOC} {EXTRA_,}NROFFFLAGS)
- $(info GROPDF {EXTRA_,}GROPDFFLAGS)
- $(info GROPS {EXTRA_,}GROPSFLAGS)
- $(info GROTTY {EXTRA_,}GROTTYFLAGS)
- $(info COL {EXTRA_,}COLFLAGS)
- $(info )
- $(info MANDOC {EXTRA_,}MANDOCFLAGS)
- $(info MAN2HTML {EXTRA_,}MAN2HTMLFLAGS)
- $(info )
- $(info BZIP2 {EXTRA_,}BZIP2FLAGS)
- $(info CP)
- $(info ECHO)
- $(info EXPR)
- $(info FIND)
- $(info GIT)
- $(info GZIP {EXTRA_,}GZIPFLAGS)
- $(info HEAD)
- $(info LN)
- $(info LOCALE)
- $(info LZIP {EXTRA_,}LZIPFLAGS)
- $(info PKGCONF)
- $(info SED)
- $(info SORTMAN)
- $(info SPONGE)
- $(info TAC)
- $(info TAIL)
- $(info TAR)
- $(info TEST)
- $(info XARGS)
- $(info XZ {EXTRA_,}XZFLAGS)
- $(info )
- $(info INSTALL)
- $(info INSTALL_DATA)
- $(info MKDIR)
- $(info RM)
- $(info )
- $(info - {EXTRA_,}CPPFLAGS)
- $(info CC {EXTRA_,}CFLAGS)
- $(info LD {EXTRA_,}LDFLAGS {EXTRA_,}LDLIBS)
- $(info )
- $(info - {EXTRA_,}CLANGFLAGS)
- $(info CHECKPATCH {EXTRA_,}CHECKPATCHFLAGS)
- $(info CLANG-TIDY {EXTRA_,}CLANG-TIDYFLAGS)
- $(info CPPCHECK {EXTRA_,}CPPCHECKFLAGS)
- $(info CPPLINT {EXTRA_,}CPPLINTFLAGS)
- $(info IWYU {EXTRA_,}IWYUFLAGS)
+ $(info $(INFO_)LINK_PAGES How to install link pages. [".so", "symlink"])
+ $(info $(INFO_)Z Install pages compressed. ["", ".bz2", ".gz", ".lz", ".xz"])
+ $(info )
+ $(info $(INFO_)DISTNAME $$(git describe))
+ $(info $(INFO_)DISTVERSION /$$DISTNAME/s/man-pages-//)
+ $(info )
+ $(info $(INFO_)HIDE_ERR Define to empty string to debug some errors)
+ $(info )
+ $(info $(INFO_)# Directory variables:)
+ $(info )
+ $(info $(INFO_)builddir .tmp)
+ $(info $(INFO_)DESTDIR )
+ $(info $(INFO_)prefix /usr/local)
+ $(info $(INFO_)mandir $$(datarootdir)/man)
+ $(info $(INFO_)docdir $$(datarootdir)/doc)
+ $(info )
+ $(info $(INFO_)man{1,...}dir $$(mandir)/man{1,...})
+ $(info $(INFO_)man{1,...}ext .{1,...})
+ $(info )
+ $(info $(INFO_)htmldir $$(docdir))
+ $(info $(INFO_)htmlext .html)
+ $(info )
+ $(info $(INFO_)# Command variables (and flags):)
+ $(info )
+ $(info $(INFO_)- MANWIDTH)
+ $(info $(INFO_)- NROFF_OUT_DEVICE)
+ $(info $(INFO_)PRECONV {EXTRA_,}PRECONVFLAGS)
+ $(info $(INFO_)TBL)
+ $(info $(INFO_)EQN {EXTRA_,}EQNFLAGS)
+ $(info $(INFO_)TROFF {EXTRA_,}TROFFFLAGS{,_MAN,_MDOC} {EXTRA_,}NROFFFLAGS)
+ $(info $(INFO_)GROPDF {EXTRA_,}GROPDFFLAGS)
+ $(info $(INFO_)GROPS {EXTRA_,}GROPSFLAGS)
+ $(info $(INFO_)GROTTY {EXTRA_,}GROTTYFLAGS)
+ $(info $(INFO_)COL {EXTRA_,}COLFLAGS)
+ $(info )
+ $(info $(INFO_)MANDOC {EXTRA_,}MANDOCFLAGS)
+ $(info $(INFO_)MAN2HTML {EXTRA_,}MAN2HTMLFLAGS)
+ $(info )
+ $(info $(INFO_)BZIP2 {EXTRA_,}BZIP2FLAGS)
+ $(info $(INFO_)CP)
+ $(info $(INFO_)ECHO)
+ $(info $(INFO_)EXPR)
+ $(info $(INFO_)FIND)
+ $(info $(INFO_)GIT)
+ $(info $(INFO_)GZIP {EXTRA_,}GZIPFLAGS)
+ $(info $(INFO_)HEAD)
+ $(info $(INFO_)LN)
+ $(info $(INFO_)LOCALE)
+ $(info $(INFO_)LZIP {EXTRA_,}LZIPFLAGS)
+ $(info $(INFO_)PKGCONF)
+ $(info $(INFO_)SED)
+ $(info $(INFO_)SORTMAN)
+ $(info $(INFO_)SPONGE)
+ $(info $(INFO_)TAC)
+ $(info $(INFO_)TAIL)
+ $(info $(INFO_)TAR)
+ $(info $(INFO_)TEST)
+ $(info $(INFO_)XARGS)
+ $(info $(INFO_)XZ {EXTRA_,}XZFLAGS)
+ $(info )
+ $(info $(INFO_)INSTALL)
+ $(info $(INFO_)INSTALL_DATA)
+ $(info $(INFO_)MKDIR)
+ $(info $(INFO_)RM)
+ $(info )
+ $(info $(INFO_)- {EXTRA_,}CPPFLAGS)
+ $(info $(INFO_)CC {EXTRA_,}CFLAGS)
+ $(info $(INFO_)LD {EXTRA_,}LDFLAGS {EXTRA_,}LDLIBS)
+ $(info )
+ $(info $(INFO_)- {EXTRA_,}CLANGFLAGS)
+ $(info $(INFO_)CHECKPATCH {EXTRA_,}CHECKPATCHFLAGS)
+ $(info $(INFO_)CLANG-TIDY {EXTRA_,}CLANG-TIDYFLAGS)
+ $(info $(INFO_)CPPCHECK {EXTRA_,}CPPCHECKFLAGS)
+ $(info $(INFO_)CPPLINT {EXTRA_,}CPPLINTFLAGS)
+ $(info $(INFO_)IWYU {EXTRA_,}IWYUFLAGS)
$(info )
diff --git a/share/mk/build/book.mk b/share/mk/build/book.mk
index 6465d7b697..63788e345c 100644
--- a/share/mk/build/book.mk
+++ b/share/mk/build/book.mk
@@ -22,7 +22,7 @@ _LMB := $(_MANDIR)/man-pages.pdf
$(_LMB): $(MANPAGES) $(wildcard $(LMBDIR)/* $(LMBDIR)/*/*) | $$(@D)/
- $(info Build $@)
+ $(info $(INFO_)Build $@)
$(BUILDLMB) $(MANDIR) \
| $(SPONGE) $@
diff --git a/share/mk/build/catman/eqn.mk b/share/mk/build/catman/eqn.mk
index c88d833bb2..48b6e752fd 100644
--- a/share/mk/build/catman/eqn.mk
+++ b/share/mk/build/catman/eqn.mk
@@ -15,7 +15,7 @@ _CATMAN_troff := $(patsubst %.eqn,%.cat.troff,$(_MAN_eqn))
$(_CATMAN_troff): %.cat.troff: %.eqn $(MK) | $$(@D)/
- $(info EQN $@)
+ $(info $(INFO_)EQN $@)
! ($(EQN) -T$(NROFF_OUT_DEVICE) $(EQNFLAGS) <$< 2>&1 >$@) \
| $(GREP) ^ >&2
diff --git a/share/mk/build/catman/grotty.mk b/share/mk/build/catman/grotty.mk
index 825e81d543..7def4140f1 100644
--- a/share/mk/build/catman/grotty.mk
+++ b/share/mk/build/catman/grotty.mk
@@ -14,7 +14,7 @@ _CATMAN := $(patsubst %.cat.set,%.cat,$(_CATMAN_MAN_set) $(_CATMAN_MDOC_set))
$(_CATMAN): %.cat: %.cat.set $(MK) | $$(@D)/
- $(info GROTTY $@)
+ $(info $(INFO_)GROTTY $@)
$(GROTTY) $(GROTTYFLAGS) <$< >$@
diff --git a/share/mk/build/catman/troff.mk b/share/mk/build/catman/troff.mk
index 4bd0c252cd..56c67697b8 100644
--- a/share/mk/build/catman/troff.mk
+++ b/share/mk/build/catman/troff.mk
@@ -22,7 +22,7 @@ _CATMAN_MDOC_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.cat.set,$(NONSO_MDOC))
$(_CATMAN_MAN_set): %.cat.set: %.cat.troff $(groff_man_ignore_grep) $(MK) | $$(@D)/
- $(info TROFF $@)
+ $(info $(INFO_)TROFF $@)
! ($(TROFF) -man $(TROFFFLAGS) $(NROFFFLAGS) <$< 2>&1 >$@ \
| $(GREP) -v -f '$(groff_man_ignore_grep)' \
|| $(TRUE); \
@@ -30,7 +30,7 @@ $(_CATMAN_MAN_set): %.cat.set: %.cat.troff $(groff_man_ignore_grep) $(MK) | $$(@
| $(GREP) ^ >&2
$(_CATMAN_MDOC_set): %.cat.set: %.cat.troff $(MK) | $$(@D)/
- $(info TROFF $@)
+ $(info $(INFO_)TROFF $@)
! ($(TROFF) -mdoc $(TROFFFLAGS) $(NROFFFLAGS) <$< 2>&1 >$@) \
| $(GREP) ^ >&2
diff --git a/share/mk/build/examples/_.mk b/share/mk/build/examples/_.mk
index fe5e933752..c01a952d3f 100644
--- a/share/mk/build/examples/_.mk
+++ b/share/mk/build/examples/_.mk
@@ -16,7 +16,7 @@ _PAGEEXDIRS := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.d/,$(NONSO_MAN))
$(_PAGEEXDIRS):
- +$(info MKDIR $@)
+ +$(info $(INFO_)MKDIR $@)
+$(MKDIR) -p $@
+$(TOUCH) $@
diff --git a/share/mk/build/examples/cc.mk b/share/mk/build/examples/cc.mk
index 6385176842..36675ae7db 100644
--- a/share/mk/build/examples/cc.mk
+++ b/share/mk/build/examples/cc.mk
@@ -15,7 +15,7 @@ _UNITS_ex_o := $(patsubst %.c,%.o,$(_UNITS_ex_c))
$(_UNITS_ex_o): %.o: %.c $(MK)
- $(info CC $@)
+ $(info $(INFO_)CC $@)
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
diff --git a/share/mk/build/examples/ld.mk b/share/mk/build/examples/ld.mk
index 9915a81546..aa44890626 100644
--- a/share/mk/build/examples/ld.mk
+++ b/share/mk/build/examples/ld.mk
@@ -14,7 +14,7 @@ _UNITS_ex_bin := $(patsubst %.o,%,$(_UNITS_ex_o))
$(_UNITS_ex_bin): %: %.o $(MK)
- $(info LD $@)
+ $(info $(INFO_)LD $@)
$(LD) $(LDFLAGS) -o $@ $< $(LDLIBS)
diff --git a/share/mk/build/examples/src.mk b/share/mk/build/examples/src.mk
index 8ffa9aeee2..a8b5012bc9 100644
--- a/share/mk/build/examples/src.mk
+++ b/share/mk/build/examples/src.mk
@@ -34,7 +34,7 @@ _UNITS_ex_c := $(filter %.c,$(_UNITS_ex_src))
$(_UNITS_ex_src): $$(patsubst $(_MANDIR)/%.d,$(MANDIR)/%,$$(@D)) $(MK) | $$(@D)/
$(_UNITS_ex_c): $$(filter $$(@D)/%.h,$(_UNITS_ex_h))
$(_UNITS_ex_src):
- $(info SED $@)
+ $(info $(INFO_)SED $@)
<$< \
$(SED) -n \
-e '/^\.TH/,/^\.SH/{/^\.SH/!p}' \
diff --git a/share/mk/build/html.mk b/share/mk/build/html.mk
index e16b9abadc..4e496526ed 100644
--- a/share/mk/build/html.mk
+++ b/share/mk/build/html.mk
@@ -25,7 +25,7 @@ _HTMLPAGES := $(patsubst $(MANDIR)/%,$(_HTMLDIR)/%$(htmlext),$(MANPAGES))
# make MAN2HTMLFLAGS=whatever html
# The sed removes the lines "Content-type: text/html\n\n"
$(_HTMLPAGES): $(_HTMLDIR)/%$(htmlext): $(MANDIR)/% $(MK) | $$(@D)/
- $(info MAN2HTML $@)
+ $(info $(INFO_)MAN2HTML $@)
$(MAN2HTML) $(MAN2HTMLFLAGS) $< \
| $(SED) -e 1,2d >$@
diff --git a/share/mk/build/pdf/eqn.mk b/share/mk/build/pdf/eqn.mk
index 9fbb002ec1..bb0598b576 100644
--- a/share/mk/build/pdf/eqn.mk
+++ b/share/mk/build/pdf/eqn.mk
@@ -15,7 +15,7 @@ _PDFMAN_troff := $(patsubst %.eqn,%.pdf.troff,$(_MAN_eqn))
$(_PDFMAN_troff): %.pdf.troff: %.eqn $(MK) | $$(@D)/
- $(info EQN $@)
+ $(info $(INFO_)EQN $@)
! ($(EQN) -Tpdf $(EQNFLAGS) <$< 2>&1 >$@) \
| $(GREP) ^ >&2
diff --git a/share/mk/build/pdf/gropdf.mk b/share/mk/build/pdf/gropdf.mk
index 0f63573380..0913122cf9 100644
--- a/share/mk/build/pdf/gropdf.mk
+++ b/share/mk/build/pdf/gropdf.mk
@@ -14,7 +14,7 @@ _PDFMAN := $(patsubst %.pdf.set,%.pdf,$(_PDFMAN_MAN_set) $(_PDFMAN_MDOC_set))
$(_PDFMAN): %.pdf: %.pdf.set $(MK) | $$(@D)/
- $(info GROPDF $@)
+ $(info $(INFO_)GROPDF $@)
$(GROPDF) $(GROPDFFLAGS) <$< >$@
diff --git a/share/mk/build/pdf/troff.mk b/share/mk/build/pdf/troff.mk
index f08332d932..71d541ebdc 100644
--- a/share/mk/build/pdf/troff.mk
+++ b/share/mk/build/pdf/troff.mk
@@ -18,12 +18,12 @@ _PDFMAN_MDOC_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.pdf.set,$(NONSO_MDOC))
$(_PDFMAN_MAN_set): %.pdf.set: %.pdf.troff $(MK) | $$(@D)/
- $(info TROFF $@)
+ $(info $(INFO_)TROFF $@)
! ($(TROFF) -man -Tpdf $(TROFFFLAGS) <$< 2>&1 >$@) \
| $(GREP) ^ >&2
$(_PDFMAN_MDOC_set): %.pdf.set: %.pdf.troff $(MK) | $$(@D)/
- $(info TROFF $@)
+ $(info $(INFO_)TROFF $@)
! ($(TROFF) -mdoc -Tpdf $(TROFFFLAGS) <$< 2>&1 >$@) \
| $(GREP) ^ >&2
diff --git a/share/mk/build/pre/preconv.mk b/share/mk/build/pre/preconv.mk
index 71794d35d5..73aa1dad19 100644
--- a/share/mk/build/pre/preconv.mk
+++ b/share/mk/build/pre/preconv.mk
@@ -16,7 +16,7 @@ _MAN_tbl := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.tbl,$(NONSO_MAN) $(NONSO_MDOC))
$(_MAN_tbl): $(_MANDIR)/%.tbl: $(MANDIR)/% $(MK) | $$(@D)/
- $(info PRECONV $@)
+ $(info $(INFO_)PRECONV $@)
$(PRECONV) $(PRECONVFLAGS) $< >$@
diff --git a/share/mk/build/pre/tbl.mk b/share/mk/build/pre/tbl.mk
index 195af087ec..24486f8ea7 100644
--- a/share/mk/build/pre/tbl.mk
+++ b/share/mk/build/pre/tbl.mk
@@ -14,7 +14,7 @@ _MAN_eqn := $(patsubst %.tbl,%.eqn,$(_MAN_tbl))
$(_MAN_eqn): %.eqn: %.tbl $(MK) | $$(@D)/
- $(info TBL $@)
+ $(info $(INFO_)TBL $@)
$(TBL) <$< >$@
diff --git a/share/mk/build/ps/eqn.mk b/share/mk/build/ps/eqn.mk
index d73b66944b..a4c921e237 100644
--- a/share/mk/build/ps/eqn.mk
+++ b/share/mk/build/ps/eqn.mk
@@ -15,7 +15,7 @@ _PSMAN_troff := $(patsubst %.eqn,%.ps.troff,$(_MAN_eqn))
$(_PSMAN_troff): %.ps.troff: %.eqn $(MK) | $$(@D)/
- $(info EQN $@)
+ $(info $(INFO_)EQN $@)
! ($(EQN) -Tps $(EQNFLAGS) <$< 2>&1 >$@) \
| $(GREP) ^ >&2
diff --git a/share/mk/build/ps/grops.mk b/share/mk/build/ps/grops.mk
index 398f68d016..cca9b444a6 100644
--- a/share/mk/build/ps/grops.mk
+++ b/share/mk/build/ps/grops.mk
@@ -14,7 +14,7 @@ _PSMAN := $(patsubst %.ps.set,%.ps,$(_PSMAN_MAN_set) $(_PSMAN_MDOC_set))
$(_PSMAN): %.ps: %.ps.set $(MK) | $$(@D)/
- $(info GROPS $@)
+ $(info $(INFO_)GROPS $@)
$(GROPS) $(GROPSFLAGS) <$< >$@
diff --git a/share/mk/build/ps/troff.mk b/share/mk/build/ps/troff.mk
index 9d02547e21..a382a6553b 100644
--- a/share/mk/build/ps/troff.mk
+++ b/share/mk/build/ps/troff.mk
@@ -18,12 +18,12 @@ _PSMAN_MDOC_set:= $(patsubst $(MANDIR)/%,$(_MANDIR)/%.ps.set,$(NONSO_MDOC))
$(_PSMAN_MAN_set): %.ps.set: %.ps.troff $(MK) | $$(@D)/
- $(info TROFF $@)
+ $(info $(INFO_)TROFF $@)
! ($(TROFF) -man -Tps $(TROFFFLAGS) <$< 2>&1 >$@) \
| $(GREP) ^ >&2
$(_PSMAN_MDOC_set): %.ps.set: %.ps.troff $(MK) | $$(@D)/
- $(info TROFF $@)
+ $(info $(INFO_)TROFF $@)
! ($(TROFF) -mdoc -Tps $(TROFFFLAGS) <$< 2>&1 >$@) \
| $(GREP) ^ >&2
diff --git a/share/mk/check/catman/col.mk b/share/mk/check/catman/col.mk
index 7fd7667867..59104fa452 100644
--- a/share/mk/check/catman/col.mk
+++ b/share/mk/check/catman/col.mk
@@ -14,7 +14,7 @@ _CHECK_catman_grep := $(patsubst %.cat,%.cat.grep,$(_CATMAN))
$(_CHECK_catman_grep): %.grep: % $(MK) | $$(@D)/
- $(info COL $@)
+ $(info $(INFO_)COL $@)
$(COL) $(COLFLAGS) <$< >$@
diff --git a/share/mk/check/catman/grep.mk b/share/mk/check/catman/grep.mk
index 974fba2769..e55579ce8e 100644
--- a/share/mk/check/catman/grep.mk
+++ b/share/mk/check/catman/grep.mk
@@ -15,7 +15,7 @@ _CHECK_catman := $(patsubst %.cat.grep,%.check-catman.touch,$(_CHECK_catman_grep
$(_CHECK_catman): %.check-catman.touch: %.cat.grep $(MK) | $$(@D)/
- $(info GREP $@)
+ $(info $(INFO_)GREP $@)
! $(GREP) -n '.\{$(MANWIDTH)\}.' $< /dev/null >&2
$(TOUCH) $@
diff --git a/share/mk/clean.mk b/share/mk/clean.mk
index 90a7bfcc4f..8129be98ff 100644
--- a/share/mk/clean.mk
+++ b/share/mk/clean.mk
@@ -13,11 +13,11 @@ include $(MAKEFILEDIR)/dist/check/tar.mk
.PHONY: clean
clean:
- $(info RM -rf $(builddir))
+ $(info $(INFO_)RM -rf $(builddir))
$(RM) -rf $(builddir)
- $(info RM -rf $(TMPDIR1))
+ $(info $(INFO_)RM -rf $(TMPDIR1))
$(RM) -rf $(TMPDIR1)
- $(info RM -rf $(TMPDIR2))
+ $(info $(INFO_)RM -rf $(TMPDIR2))
$(RM) -rf $(TMPDIR2)
diff --git a/share/mk/dist/_.mk b/share/mk/dist/_.mk
index bba45cebb1..f6d8669f3a 100644
--- a/share/mk/dist/_.mk
+++ b/share/mk/dist/_.mk
@@ -14,7 +14,7 @@ _DISTDIR := $(builddir)/dist
$(builddir)/dist/%/:
- +$(info MKDIR $@)
+ +$(info $(INFO_)MKDIR $@)
+$(INSTALL_DIR) $@
diff --git a/share/mk/dist/check/all.mk b/share/mk/dist/check/all.mk
index 2043e6eac5..114a48a77e 100644
--- a/share/mk/dist/check/all.mk
+++ b/share/mk/dist/check/all.mk
@@ -7,7 +7,6 @@ MAKEFILE_DIST_CHECK_ALL_INCLUDED := 1
include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/sed.mk
include $(MAKEFILEDIR)/configure/directory_variables.mk
include $(MAKEFILEDIR)/configure/version.mk
include $(MAKEFILEDIR)/dist/check/tar.mk
@@ -22,9 +21,9 @@ $(builddir)/distcheck.all.touch: \
$(builddir)/distcheck.lint-man.touch \
$(builddir)/distcheck.lint-mdoc.touch
$(builddir)/distcheck.all.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
- #$(info MAKE all)
+ #$(info $(INFO_)MAKE all)
#$(MAKE) -C $< all \
- #| $(SED) 's,^,MAKE all: ,'
+ # 'INFO_= all: '
$(TOUCH) $@
diff --git a/share/mk/dist/check/build.mk b/share/mk/dist/check/build.mk
index 8f48dfa4bf..18fa274a69 100644
--- a/share/mk/dist/check/build.mk
+++ b/share/mk/dist/check/build.mk
@@ -8,7 +8,6 @@ MAKEFILE_DIST_CHECK_BUILD_INCLUDED := 1
include $(MAKEFILEDIR)/build/_.mk
include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/sed.mk
include $(MAKEFILEDIR)/configure/directory_variables.mk
include $(MAKEFILEDIR)/configure/verbose.mk
include $(MAKEFILEDIR)/configure/version.mk
@@ -172,60 +171,60 @@ DISTCHECK_IGNORE_BUILD_PDF := \
$(builddir)/distcheck.build-pre.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
- $(info MAKE build-pre)
+ $(info $(INFO_)MAKE build-pre)
$(MAKE) -C $< build-pre \
- | $(SED) 's,^,MAKE build-pre: ,'
+ 'INFO_= build-pre: '
$(TOUCH) $@
$(builddir)/distcheck.build-catman.touch: $(builddir)/distcheck.build-pre.touch
$(builddir)/distcheck.build-catman.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
- $(info MAKE build-catman)
- $(MAKE) -C $< -k build-catman $(HIDE_ERR) \
- | $(SED) 's,^,MAKE build-catman -k: ,' \
+ $(info $(INFO_)MAKE build-catman)
+ $(MAKE) -C $< -k build-catman \
+ 'INFO_= build-catman -k: ' $(HIDE_ERR) \
|| $(TRUE)
- $(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_CATMAN) $(HIDE_ERR) \
- | $(SED) 's,^,MAKE build-catman -i: ,'
+ $(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_CATMAN) \
+ 'INFO_= build-catman -i: ' $(HIDE_ERR)
$(MAKE) -C $< build-catman \
- | $(SED) 's,^,MAKE build-catman: ,'
+ 'INFO_= build-catman: '
$(TOUCH) $@
$(builddir)/distcheck.build-ps.touch: $(builddir)/distcheck.build-pre.touch
$(builddir)/distcheck.build-ps.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
- $(info MAKE build-ps)
- $(MAKE) -C $< -k build-ps $(HIDE_ERR) \
- | $(SED) 's,^,MAKE build-ps -k: ,' \
+ $(info $(INFO_)MAKE build-ps)
+ $(MAKE) -C $< -k build-ps \
+ 'INFO_= build-ps -k: ' $(HIDE_ERR) \
|| $(TRUE)
- $(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_PS) $(HIDE_ERR) \
- | $(SED) 's,^,MAKE build-ps -i: ,'
+ $(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_PS) \
+ 'INFO_= build-ps -i: ' $(HIDE_ERR)
$(MAKE) -C $< build-ps \
- | $(SED) 's,^,MAKE build-ps: ,'
+ 'INFO_= build-ps: '
$(TOUCH) $@
$(builddir)/distcheck.build-pdf.touch: $(builddir)/distcheck.build-pre.touch
$(builddir)/distcheck.build-pdf.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
- $(info MAKE build-pdf)
- $(MAKE) -C $< -k build-pdf $(HIDE_ERR) \
- | $(SED) 's,^,MAKE build-pdf -k: ,' \
+ $(info $(INFO_)MAKE build-pdf)
+ $(MAKE) -C $< -k build-pdf \
+ 'INFO_= build-pdf -k: ' $(HIDE_ERR) \
|| $(TRUE)
- $(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_PDF) $(HIDE_ERR) \
- | $(SED) 's,^,MAKE build-pdf -i: ,'
+ $(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_PDF) \
+ 'INFO_= build-pdf -i: ' $(HIDE_ERR)
$(MAKE) -C $< build-pdf \
- | $(SED) 's,^,MAKE build-pdf: ,'
+ 'INFO_= build-pdf: '
$(TOUCH) $@
$(builddir)/distcheck.build-html.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
- $(info MAKE build-html)
+ $(info $(INFO_)MAKE build-html)
$(MAKE) -C $< build-html \
- | $(SED) 's,^,MAKE build-html: ,'
+ 'INFO_= build-html: '
$(TOUCH) $@
$(builddir)/distcheck.build-book.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
- $(info MAKE build-book)
- $(MAKE) -C $< -k build-book $(HIDE_ERR) \
- | $(SED) 's,^,MAKE build-book: ,' \
+ $(info $(INFO_)MAKE build-book)
+ $(MAKE) -C $< -k build-book \
+ 'INFO_= build-book -k: ' $(HIDE_ERR) \
|| $(TRUE)
$(MAKE) -C $< build-book \
- | $(SED) 's,^,MAKE build-book: ,'
+ 'INFO_= build-book: '
$(TOUCH) $@
diff --git a/share/mk/dist/check/check.mk b/share/mk/dist/check/check.mk
index 56bf20ccfe..bf47aff984 100644
--- a/share/mk/dist/check/check.mk
+++ b/share/mk/dist/check/check.mk
@@ -7,7 +7,6 @@ MAKEFILE_DIST_CHECK_CHECK_INCLUDED := 1
include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/sed.mk
include $(MAKEFILEDIR)/configure/build-depends/tar.mk
include $(MAKEFILEDIR)/configure/directory_variables.mk
include $(MAKEFILEDIR)/configure/verbose.mk
@@ -87,22 +86,22 @@ DISTCHECK_IGNORE_CHECK_CATMAN := \
$(builddir)/distcheck.check-catman.touch: \
$(builddir)/distcheck.build-catman.touch
$(builddir)/distcheck.check-catman.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
- $(info MAKE check-catman)
+ $(info $(INFO_)MAKE check-catman)
$(MAKE) -C $< -k check-catman $(HIDE_ERR) \
- | $(SED) 's,^,MAKE check-catman -k: ,' \
+ 'INFO_= check-catman -k: ' $(HIDE_ERR) \
|| $(TRUE)
$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_CHECK_CATMAN) $(HIDE_ERR) \
- | $(SED) 's,^,MAKE check-catman -i: ,'
+ 'INFO_= check-catman -i: ' $(HIDE_ERR)
$(MAKE) -C $< check-catman \
- | $(SED) 's,^,MAKE check-catman: ,'
+ 'INFO_= check-catman: '
$(TOUCH) $@
$(builddir)/distcheck.check.touch: \
$(builddir)/distcheck.check-catman.touch
$(builddir)/distcheck.check.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
- $(info MAKE check)
+ $(info $(INFO_)MAKE check)
$(MAKE) -C $< check \
- | $(SED) 's,^,MAKE check: ,'
+ 'INFO_= check: '
$(TOUCH) $@
diff --git a/share/mk/dist/check/diffoscope.mk b/share/mk/dist/check/diffoscope.mk
index 8cc0580135..457abc63fe 100644
--- a/share/mk/dist/check/diffoscope.mk
+++ b/share/mk/dist/check/diffoscope.mk
@@ -14,7 +14,7 @@ include $(MAKEFILEDIR)/dist/tar.mk
$(builddir)/distcheck.diffoscope.touch: $(DISTFILE) $(REDIST) | $$(@D)/
- $(info DIFFOSCOPE $^)
+ $(info $(INFO_)DIFFOSCOPE $^)
$(DIFFOSCOPE) $^
$(TOUCH) $@
diff --git a/share/mk/dist/check/dist.mk b/share/mk/dist/check/dist.mk
index d2df21f844..4a5c0d4cea 100644
--- a/share/mk/dist/check/dist.mk
+++ b/share/mk/dist/check/dist.mk
@@ -15,9 +15,9 @@ REDIST := $(TMPDIR1)/$(DISTNAME)/.tmp/$(DISTNAME).tar
$(REDIST): %/.tmp/$(DISTNAME).tar: % | $$(@D)/
- $(info MAKE dist)
+ $(info $(INFO_)MAKE dist)
$(MAKE) -C $< dist \
- | $(SED) 's,^,MAKE dist: ,'
+ 'INFO_= dist: '
endif # include guard
diff --git a/share/mk/dist/check/install.mk b/share/mk/dist/check/install.mk
index 56835498a8..9147f961ce 100644
--- a/share/mk/dist/check/install.mk
+++ b/share/mk/dist/check/install.mk
@@ -14,9 +14,9 @@ include $(MAKEFILEDIR)/dist/check/tar.mk
$(builddir)/distcheck.install.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
- $(info MAKE install)
+ $(info $(INFO_)MAKE install)
$(MAKE) -C $< install DESTDIR=$(TMPDIR2) \
- | $(SED) 's,^,MAKE install: ,'
+ 'INFO_= install: '
$(TOUCH) $@
diff --git a/share/mk/dist/check/lint.mk b/share/mk/dist/check/lint.mk
index e3177ec06c..45fca77555 100644
--- a/share/mk/dist/check/lint.mk
+++ b/share/mk/dist/check/lint.mk
@@ -26,20 +26,20 @@ DISTCHECK_IGNORE_LINT_MAN := \
$(builddir)/distcheck.lint-man.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
- $(info MAKE lint-man)
- $(MAKE) -C $< -k lint-man $(HIDE_ERR) \
- | $(SED) 's,^,MAKE lint-man -k: ,' \
+ $(info $(INFO_)MAKE lint-man)
+ $(MAKE) -C $< -k lint-man \
+ 'INFO_= lint-man -k: ' $(HIDE_ERR) \
|| $(TRUE)
- $(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_LINT_MAN) $(HIDE_ERR) \
- | $(SED) 's,^,MAKE lint-man -i: ,'
+ $(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_LINT_MAN) \
+ 'INFO_= lint-man -i: ' $(HIDE_ERR)
$(MAKE) -C $< lint-man \
- | $(SED) 's,^,MAKE lint-man: ,'
+ 'INFO_= lint-man: '
$(TOUCH) $@
$(builddir)/distcheck.lint-mdoc.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
- $(info MAKE lint-mdoc)
+ $(info $(INFO_)MAKE lint-mdoc)
$(MAKE) -C $< lint-mdoc \
- | $(SED) 's,^,MAKE lint-mdoc: ,'
+ 'INFO_= lint-mdoc: '
$(TOUCH) $@
diff --git a/share/mk/dist/check/tar.mk b/share/mk/dist/check/tar.mk
index 9ddefbb700..3d0799307f 100644
--- a/share/mk/dist/check/tar.mk
+++ b/share/mk/dist/check/tar.mk
@@ -17,11 +17,11 @@ TMPDIR2 := $(shell $(MKTEMP) -d)
$(TMPDIR1)/$(DISTNAME).tar: $(DISTFILE) | $$(@D)/
- $(info CP $@)
+ $(info $(INFO_)CP $@)
$(CP) $< $@
$(TMPDIR1)/$(DISTNAME): %: %.tar | $$(@D)/
- $(info TAR xf $<)
+ $(info $(INFO_)TAR xf $<)
cd $(dir $<) \
&& $(TAR) xf $<
$(TOUCH) $@
diff --git a/share/mk/dist/files.mk b/share/mk/dist/files.mk
index 311d063077..c64cb5a606 100644
--- a/share/mk/dist/files.mk
+++ b/share/mk/dist/files.mk
@@ -30,14 +30,14 @@ _DISTOTHERS := $(filter-out $(_DISTPAGES) $(_DISTVERSION), $(_DISTFILES))
$(_DISTPAGES): $(_DISTDIR)/man%: $(srcdir)/man% $(MK) | $$(@D)/
- $(info INSTALL $@)
+ $(info $(INFO_)INSTALL $@)
<$< \
$(SED) "/^.TH/s/(date)/$$($(GIT) log --format=%cs -1 -- $< $(HIDE_ERR))/" \
| $(SED) '/^.TH/s/(unreleased)/$(DISTVERSION)/' \
| $(INSTALL_DATA) -T /dev/stdin $@
$(_DISTVERSION): $(MAKEFILEDIR)/configure/version.mk $(DISTFILES) | $$(@D)/
- $(info SED $@)
+ $(info $(INFO_)SED $@)
<$< \
$(SED) 's/^DISTVERSION *:=.*/DISTVERSION := $(DISTVERSION)/' \
| $(SED) 's/^DISTNAME *:=.*/DISTNAME := $(DISTNAME)/' \
@@ -45,7 +45,7 @@ $(_DISTVERSION): $(MAKEFILEDIR)/configure/version.mk $(DISTFILES) | $$(@D)/
| $(INSTALL_DATA) -T /dev/stdin $@
$(_DISTOTHERS): $(_DISTDIR)/%: $(srcdir)/% $(MK) | $$(@D)/
- $(info CP $@)
+ $(info $(INFO_)CP $@)
$(CP) -T $< $@
diff --git a/share/mk/dist/tar.mk b/share/mk/dist/tar.mk
index 8c18a3f0e2..4c20bbb7d8 100644
--- a/share/mk/dist/tar.mk
+++ b/share/mk/dist/tar.mk
@@ -19,7 +19,7 @@ DISTFILE := $(builddir)/$(DISTNAME).tar
$(DISTFILE): $(_DISTFILES) $(MK) | $$(@D)/
- $(info TAR $@)
+ $(info $(INFO_)TAR $@)
$(TAR) $(TARFLAGS) -cf $@ -T /dev/null
$(DISTFILESCMD) \
| $(SED) 's,^$(srcdir)/,$(_DISTDIR)/,' \
diff --git a/share/mk/dist/z.mk b/share/mk/dist/z.mk
index e06ff210cd..ae28583541 100644
--- a/share/mk/dist/z.mk
+++ b/share/mk/dist/z.mk
@@ -19,7 +19,7 @@ compression := bz2 gz lz xz
define DISTFILE_z_rule
$(DISTFILE).$(2): %.$(2): % $(MK) | $$$$(@D)/
- $$(info $(1) $$@)
+ $$(info $(INFO_)$(1) $$@)
$($(1)) $($(1)FLAGS) -kf $$<
$(TOUCH) $$@
endef
diff --git a/share/mk/install/_.mk b/share/mk/install/_.mk
index a44a3d81b5..dc7bb7c49f 100644
--- a/share/mk/install/_.mk
+++ b/share/mk/install/_.mk
@@ -12,11 +12,11 @@ include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
%/:
- +$(info MKDIR $@)
+ +$(info $(INFO_)MKDIR $@)
+$(INSTALL_DIR) $@
%-rm:
- $(info RM $*)
+ $(info $(INFO_)RM $*)
$(RM) $*
diff --git a/share/mk/install/html.mk b/share/mk/install/html.mk
index a4d7d25f7f..d3b5056552 100644
--- a/share/mk/install/html.mk
+++ b/share/mk/install/html.mk
@@ -22,7 +22,7 @@ _htmlpages_rm := $(addsuffix -rm,$(wildcard $(_htmlpages)))
$(_htmlpages): $(_htmldir)/%: $(_HTMLDIR)/% $(MK) | $$(@D)/
- $(info INSTALL $@)
+ $(info $(INFO_)INSTALL $@)
$(INSTALL_DATA) -T $< $@
diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk
index bec9d20020..451d80345b 100644
--- a/share/mk/install/man.mk
+++ b/share/mk/install/man.mk
@@ -52,7 +52,7 @@ $(foreach s, $(MANSECTIONS), \
$(_manpages):
- $(info INSTALL $@)
+ $(info $(INFO_)INSTALL $@)
<$< \
$(SED) $(foreach s, $(MANSECTIONS), \
-e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext)$(Z),') \
diff --git a/share/mk/lint/c/checkpatch.mk b/share/mk/lint/c/checkpatch.mk
index f465f5592e..83ecc32fc1 100644
--- a/share/mk/lint/c/checkpatch.mk
+++ b/share/mk/lint/c/checkpatch.mk
@@ -12,7 +12,7 @@ include $(MAKEFILEDIR)/lint/_.mk
$(_LINT_c_checkpatch): %.lint-c.checkpatch.touch: %.c $(MK)
- $(info CHECKPATCH $@)
+ $(info $(INFO_)CHECKPATCH $@)
$(CHECKPATCH) $(CHECKPATCHFLAGS) -f $< >&2
$(TOUCH) $@
diff --git a/share/mk/lint/c/clang-tidy.mk b/share/mk/lint/c/clang-tidy.mk
index 3939227901..36f95f2481 100644
--- a/share/mk/lint/c/clang-tidy.mk
+++ b/share/mk/lint/c/clang-tidy.mk
@@ -15,7 +15,7 @@ include $(MAKEFILEDIR)/lint/_.mk
$(_LINT_c_clang-tidy): %.lint-c.clang-tidy.touch: %.c $(MK)
- $(info CLANG_TIDY $@)
+ $(info $(INFO_)CLANG_TIDY $@)
$(CLANG_TIDY) $(CLANG_TIDYFLAGS) $< -- $(CPPFLAGS) $(CLANGFLAGS) 2>&1 \
| $(SED) '/generated\.$$/d' >&2
$(TOUCH) $@
diff --git a/share/mk/lint/c/cppcheck.mk b/share/mk/lint/c/cppcheck.mk
index b326dc05fd..2d8337fcc8 100644
--- a/share/mk/lint/c/cppcheck.mk
+++ b/share/mk/lint/c/cppcheck.mk
@@ -12,7 +12,7 @@ include $(MAKEFILEDIR)/lint/_.mk
$(_LINT_c_cppcheck): %.lint-c.cppcheck.touch: %.c $(MK)
- $(info CPPCHECK $@)
+ $(info $(INFO_)CPPCHECK $@)
$(CPPCHECK) $(CPPCHECKFLAGS) $<
$(TOUCH) $@
diff --git a/share/mk/lint/c/cpplint.mk b/share/mk/lint/c/cpplint.mk
index 89036eddbd..b017b43dd7 100644
--- a/share/mk/lint/c/cpplint.mk
+++ b/share/mk/lint/c/cpplint.mk
@@ -12,7 +12,7 @@ include $(MAKEFILEDIR)/lint/_.mk
$(_LINT_c_cpplint): %.lint-c.cpplint.touch: %.c $(MK)
- $(info CPPLINT $@)
+ $(info $(INFO_)CPPLINT $@)
$(CPPLINT) $(CPPLINTFLAGS) $< >/dev/null
$(TOUCH) $@
diff --git a/share/mk/lint/c/iwyu.mk b/share/mk/lint/c/iwyu.mk
index e2e4de103f..a9a64589be 100644
--- a/share/mk/lint/c/iwyu.mk
+++ b/share/mk/lint/c/iwyu.mk
@@ -16,7 +16,7 @@ include $(MAKEFILEDIR)/lint/_.mk
$(_LINT_c_iwyu): %.lint-c.iwyu.touch: %.c $(MK)
- $(info IWYU $@)
+ $(info $(INFO_)IWYU $@)
! ($(IWYU) $(IWYUFLAGS) $(CPPFLAGS) $(CLANGFLAGS) $< 2>&1 \
| $(SED) -n '/should add these lines:/,$$p' \
| $(TAC) \
diff --git a/share/mk/lint/man/mandoc.mk b/share/mk/lint/man/mandoc.mk
index 69558de8de..cfabf3bd67 100644
--- a/share/mk/lint/man/mandoc.mk
+++ b/share/mk/lint/man/mandoc.mk
@@ -18,7 +18,7 @@ mandoc_man_ignore_grep := $(DATAROOTDIR)/lint/mandoc/man.ignore.grep
$(_LINT_man_mandoc): $(_MANDIR)/%.lint-man.mandoc.touch: $(MANDIR)/% $(mandoc_man_ignore_grep) $(MK) | $$(@D)/
- $(info MANDOC $@)
+ $(info $(INFO_)MANDOC $@)
! ($(MANDOC) -man $(MANDOCFLAGS) $< 2>&1 \
| $(GREP) -v -f '$(mandoc_man_ignore_grep)' \
|| $(TRUE); \
diff --git a/share/mk/lint/man/tbl.mk b/share/mk/lint/man/tbl.mk
index feea1dd847..751838023f 100644
--- a/share/mk/lint/man/tbl.mk
+++ b/share/mk/lint/man/tbl.mk
@@ -14,7 +14,7 @@ include $(MAKEFILEDIR)/lint/man/_.mk
$(_LINT_man_tbl): $(_MANDIR)/%.lint-man.tbl.touch: $(MANDIR)/% $(MK) | $$(@D)/
- $(info GREP $@)
+ $(info $(INFO_)GREP $@)
if $(GREP) -q '^\.TS$$' $< && ! $(HEAD) -n1 $< | $(GREP) -q '\\" t$$'; \
then \
>&2 $(ECHO) "$<:1: missing '\\\" t' comment:"; \
diff --git a/share/mk/lint/mdoc/mandoc.mk b/share/mk/lint/mdoc/mandoc.mk
index 9071b1537d..da83868953 100644
--- a/share/mk/lint/mdoc/mandoc.mk
+++ b/share/mk/lint/mdoc/mandoc.mk
@@ -20,7 +20,7 @@ mandoc_mdoc_ignore_grep := $(DATAROOTDIR)/lint/mandoc/mdoc.ignore.grep
$(_LINT_mdoc_mandoc): $(_MANDIR)/%.lint-mdoc.mandoc.touch: $(MANDIR)/% $(mandoc_mdoc_ignore_grep) | $$(@D)/
- $(info MANDOC $@)
+ $(info $(INFO_)MANDOC $@)
! ($(MANDOC) -mdoc $(MANDOCFLAGS) $< 2>&1 \
| $(GREP) -v -f '$(mandoc_mdoc_ignore_grep)' \
|| $(TRUE); \