From 11e3443c0c6812460402382857e6af9c83938e47 Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Sat, 29 Apr 2023 19:29:50 +0200 Subject: *.mk: Allow non-standard source MANDIRS Some projects don't store their source manual pages in a directory structure resembling $MANPATH. Allow such a directory structure so that we can for example lint groff's source manual pages: $ make check lint MANDIR=~/src/gnu/groff; Signed-off-by: Alejandro Colomar --- share/mk/build/_.mk | 4 ++-- share/mk/build/src.mk | 2 +- share/mk/src.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/mk/build/_.mk b/share/mk/build/_.mk index 6cc820073..2f8ae0bcb 100644 --- a/share/mk/build/_.mk +++ b/share/mk/build/_.mk @@ -23,12 +23,12 @@ MKDIR := mkdir -p RM := rm -NONSO_MAN := $(shell $(FIND) $(MANDIR)/man*/ -type f \ +NONSO_MAN := $(shell $(FIND) $(MANDIR)/ -type f \ | $(GREP) '$(MANEXT)' \ | $(XARGS) $(GREP) -l '^\.TH ' \ | $(SORT) \ | $(SED) 's,:,\\:,g') -NONSO_MDOC := $(shell $(FIND) $(MANDIR)/man*/ -type f \ +NONSO_MDOC := $(shell $(FIND) $(MANDIR)/ -type f \ | $(GREP) '$(MANEXT)' \ | $(XARGS) $(GREP) -l '^\.Dt ' \ | $(SORT) \ diff --git a/share/mk/build/src.mk b/share/mk/build/src.mk index 4da142a74..86d024e2f 100644 --- a/share/mk/build/src.mk +++ b/share/mk/build/src.mk @@ -57,7 +57,7 @@ LD := $(CC) $(CFLAGS) _SRCPAGEDIRS := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.d/,$(NONSO_MAN)) _UNITS_src_src := $(patsubst $(MANDIR)/%,$(_MANDIR)/%,$(shell \ - $(FIND) $(MANDIR)/man*/ -type f \ + $(FIND) $(MANDIR)/ -type f \ | $(GREP) '$(MANEXT)' \ | $(XARGS) $(GREP) -H '^\.\\" SRC BEGIN ' \ | $(SED) 's,:\.\\" SRC BEGIN (,.d/,' \ diff --git a/share/mk/src.mk b/share/mk/src.mk index 76deb8230..169bf7e6d 100644 --- a/share/mk/src.mk +++ b/share/mk/src.mk @@ -15,7 +15,7 @@ MANDIR := $(srcdir) MANEXT := \.[0-9]\w*\(\.man\)\?\(\.in\)\?$ -MANPAGES := $(shell $(FIND) $(MANDIR)/man*/ -type f \ +MANPAGES := $(shell $(FIND) $(MANDIR)/ -type f \ | $(GREP) '$(MANEXT)' \ | $(SORT) \ | $(SED) 's,:,\\:,g') -- cgit v1.2.3