]> git.ipfire.org Git - thirdparty/man-pages.git/commitdiff
share/mk/: $MANEXT: Use extended regex
authorAlejandro Colomar <alx@kernel.org>
Mon, 25 Nov 2024 16:37:54 +0000 (17:37 +0100)
committerAlejandro Colomar <alx@kernel.org>
Tue, 26 Nov 2024 10:22:51 +0000 (11:22 +0100)
This makes the line fit in 80 columns, and also makes it simpler to
read.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
share/mk/build/examples/src.mk
share/mk/src/man.mk

index def626c0aa129823fc1dcf493c073f94d9fed2f6..a40d4ce7350b4e7d223c8e0ee6f676594b6e7fa4 100644 (file)
@@ -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/)//' \
index 424655f0c519710d73c071603d486b5b6888770e..4ea75156b7c911097f9ae09c9eeae515372f623e 100644 (file)
@@ -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')