From: Alejandro Colomar <alx@kernel.org>
Date: Mon, 25 Nov 2024 16:37:54 +0000 (+0100)
Subject: share/mk/: $MANEXT: Use extended regex
X-Git-Tag: man-pages-6.10~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=065022de38d98fa9bd49b8c798ae00fde4368694;p=thirdparty%2Fman-pages.git

share/mk/: $MANEXT: Use extended regex

This makes the line fit in 80 columns, and also makes it simpler to
read.

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

diff --git a/share/mk/build/examples/src.mk b/share/mk/build/examples/src.mk
index def626c0a..a40d4ce73 100644
--- a/share/mk/build/examples/src.mk
+++ b/share/mk/build/examples/src.mk
@@ -21,7 +21,7 @@ _EX_TU_src := \
 	$(patsubst $(MANDIR)/%, $(_MANDIR)/%, \
 		$(shell \
 			$(FIND) $(MANDIR)/* -type f \
-			| $(GREP) '$(MANEXT)' \
+			| $(GREP) -E '$(MANEXT)' \
 			| $(XARGS) $(GREP) -H '^\.\\" SRC BEGIN ' \
 			| $(SED) 's,:\.\\" SRC BEGIN (,.d/,' \
 			| $(SED) 's/)//' \
diff --git a/share/mk/src/man.mk b/share/mk/src/man.mk
index 424655f0c..4ea75156b 100644
--- a/share/mk/src/man.mk
+++ b/share/mk/src/man.mk
@@ -14,18 +14,18 @@ include $(MAKEFILEDIR)/configure/directory_variables/src.mk
 include $(MAKEFILEDIR)/src/sortman.mk
 
 
-MANEXT := \(\.[[:digit:]]\([[:alpha:]][[:alnum:]]*\)\?\>\|\.man\)\+\(\.man\|\.in\)*$
+MANEXT := (\.[[:digit:]]([[:alpha:]][[:alnum:]]*)?\>|\.man)+(\.man|\.in)*$
 
 
 MANPAGES := $(shell $(FIND) $(MANDIR)/* -type f \
-		| $(GREP) '$(MANEXT)' \
+		| $(GREP) -E '$(MANEXT)' \
 		| $(SORTMAN) \
 		| $(SED) 's,:,\\:,g')
 
 
 MANINTROPAGES := $(shell $(FIND) $(MANDIR)/* -type f \
-		| $(GREP) '$(MANEXT)' \
-		| $(GREP) '/intro$(MANEXT)' \
+		| $(GREP) -E '$(MANEXT)' \
+		| $(GREP) -E '/intro$(MANEXT)' \
 		| $(SORTMAN) \
 		| $(SED) 's,:,\\:,g')
 
@@ -44,12 +44,12 @@ $(foreach s, $(MANSECTIONS),                                                  \
 
 
 NONSO_MAN := $(shell $(FIND) $(MANDIR)/* -type f \
-		| $(GREP) '$(MANEXT)' \
+		| $(GREP) -E '$(MANEXT)' \
 		| $(XARGS) $(GREP) -l '^\.TH ' \
 		| $(SORTMAN) \
 		| $(SED) 's,:,\\:,g')
 NONSO_MDOC := $(shell $(FIND) $(MANDIR)/* -type f \
-		| $(GREP) '$(MANEXT)' \
+		| $(GREP) -E '$(MANEXT)' \
 		| $(XARGS) $(GREP) -l '^\.Dt ' \
 		| $(SORTMAN) \
 		| $(SED) 's,:,\\:,g')