diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-24 04:52:22 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-24 04:52:22 +0000 |
| commit | 3d08cd331c1adcf0d917392f7e527b3f00511748 (patch) | |
| tree | 312f0d1e1632f48862f044b8bb87e602dcffb5f9 /share/mk/src | |
| parent | Adding debian version 6.7-2. (diff) | |
| download | manpages-3d08cd331c1adcf0d917392f7e527b3f00511748.tar.xz manpages-3d08cd331c1adcf0d917392f7e527b3f00511748.zip | |
Merging upstream version 6.8.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | share/mk/src/man.mk (renamed from share/mk/src.mk) | 25 | ||||
| -rw-r--r-- | share/mk/src/sortman.mk | 12 |
2 files changed, 23 insertions, 14 deletions
diff --git a/share/mk/src.mk b/share/mk/src/man.mk index 20c0037..424655f 100644 --- a/share/mk/src.mk +++ b/share/mk/src/man.mk @@ -2,17 +2,16 @@ # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception -ifndef MAKEFILE_SRC_INCLUDED -MAKEFILE_SRC_INCLUDED := 1 +ifndef MAKEFILE_SRC_MAN_INCLUDED +MAKEFILE_SRC_MAN_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/build-depends/findutils.mk -include $(MAKEFILEDIR)/configure/build-depends/grep.mk -include $(MAKEFILEDIR)/configure/build-depends/sed.mk -include $(MAKEFILEDIR)/configure/src.mk - - -SORTMAN := $(srcdir)/scripts/sortman +include $(MAKEFILEDIR)/configure/build-depends/findutils/find.mk +include $(MAKEFILEDIR)/configure/build-depends/findutils/xargs.mk +include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk +include $(MAKEFILEDIR)/configure/build-depends/sed/sed.mk +include $(MAKEFILEDIR)/configure/directory_variables/src.mk +include $(MAKEFILEDIR)/src/sortman.mk MANEXT := \(\.[[:digit:]]\([[:alpha:]][[:alnum:]]*\)\?\>\|\.man\)\+\(\.man\|\.in\)*$ @@ -32,17 +31,14 @@ MANINTROPAGES := $(shell $(FIND) $(MANDIR)/* -type f \ $(foreach s, $(MANSECTIONS), \ - $(eval MAN$(s)DIR := $(MANDIR)/man$(s))) - -$(foreach s, $(MANSECTIONS), \ $(eval MAN$(s)PAGES := \ $(filter-out $(MANINTROPAGES), \ - $(filter $(MANDIR)/man$(s)/%, \ + $(filter $(MAN$(s)DIR)/%, \ $(filter %.$(s), \ $(MANPAGES)))))) $(foreach s, $(MANSECTIONS), \ $(eval MAN$(s)INTROPAGE := \ - $(filter $(MANDIR)/man$(s)/%, \ + $(filter $(MAN$(s)DIR)/%, \ $(filter %.$(s), \ $(MANINTROPAGES))))) @@ -57,6 +53,7 @@ NONSO_MDOC := $(shell $(FIND) $(MANDIR)/* -type f \ | $(XARGS) $(GREP) -l '^\.Dt ' \ | $(SORTMAN) \ | $(SED) 's,:,\\:,g') +SO_MAN := $(filter-out $(NONSO_MAN) $(NONSO_MDOC), $(MANPAGES)) endif # include guard diff --git a/share/mk/src/sortman.mk b/share/mk/src/sortman.mk new file mode 100644 index 0000000..730274b --- /dev/null +++ b/share/mk/src/sortman.mk @@ -0,0 +1,12 @@ +# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_SRC_SORTMAN_INCLUDED +MAKEFILE_SRC_SORTMAN_INCLUDED := 1 + + +SORTMAN := $(CURDIR)/scripts/sortman + + +endif # include guard |