share/mk/: Move configuration variables to share/mk/configure/

Some variables are only part of the implementation of our build system,
and users should not modify them; others are designed to be set by users
when they invoke make(1).  Define the latter in share/mk/configure/, so
that they are more visible.

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

25 files changed, 114 insertions, 84 deletions

diff --git a/share/mk/build/_.mk b/share/mk/build/_.mk
index 53d5f0e057..7dae6f70ab 100644
--- a/share/mk/build/_.mk
+++ b/share/mk/build/_.mk
@@ -9,30 +9,12 @@ MAKEFILE_BUILD_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/findutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/grep.mk
-include $(MAKEFILEDIR)/configure/build-depends/sed.mk
-include $(MAKEFILEDIR)/configure/build-depends/sortman.mk
-include $(MAKEFILEDIR)/src.mk
+include $(MAKEFILEDIR)/configure/directory_variables.mk
 
 
-builddir := .tmp
-
 _MANDIR := $(builddir)/man
 
 
-NONSO_MAN := $(shell $(FIND) $(MANDIR)/* -type f \
-		| $(GREP) '$(MANEXT)' \
-		| $(XARGS) $(GREP) -l '^\.TH ' \
-		| $(SORTMAN) \
-		| $(SED) 's,:,\\:,g')
-NONSO_MDOC := $(shell $(FIND) $(MANDIR)/* -type f \
-		| $(GREP) '$(MANEXT)' \
-		| $(XARGS) $(GREP) -l '^\.Dt ' \
-		| $(SORTMAN) \
-		| $(SED) 's,:,\\:,g')
-
-
 .PHONY: build
 build: build-book build-catman build-html build-pdf build-ps build-src;
 
diff --git a/share/mk/build/book.mk b/share/mk/build/book.mk
index 86cc9acd38..3ca47bc70a 100644
--- a/share/mk/build/book.mk
+++ b/share/mk/build/book.mk
@@ -10,6 +10,7 @@ MAKEFILE_BUILD_BOOK_INCLUDED := 1
 
 include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/configure/build-depends/moreutils.mk
+include $(MAKEFILEDIR)/configure/src.mk
 include $(MAKEFILEDIR)/src.mk
 
 
diff --git a/share/mk/build/html.mk b/share/mk/build/html.mk
index 84452ad249..1b1f8c65aa 100644
--- a/share/mk/build/html.mk
+++ b/share/mk/build/html.mk
@@ -8,13 +8,13 @@ ifndef MAKEFILE_BUILD_HTML_INCLUDED
 MAKEFILE_BUILD_HTML_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/configure/build-depends/man2html.mk
 include $(MAKEFILEDIR)/configure/build-depends/sed.mk
+include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/src.mk
 include $(MAKEFILEDIR)/src.mk
 
 
-htmlext  := .html
 _HTMLDIR := $(builddir)/html
 
 
diff --git a/share/mk/build/src.mk b/share/mk/build/src.mk
index c6d1a12484..7d0e281cc5 100644
--- a/share/mk/build/src.mk
+++ b/share/mk/build/src.mk
@@ -17,9 +17,8 @@ include $(MAKEFILEDIR)/configure/build-depends/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/ld.mk
 include $(MAKEFILEDIR)/configure/build-depends/mandoc.mk
 include $(MAKEFILEDIR)/configure/build-depends/sed.mk
-include $(MAKEFILEDIR)/configure/build-depends/sortman.mk
+include $(MAKEFILEDIR)/configure/verbose.mk
 include $(MAKEFILEDIR)/src.mk
-include $(MAKEFILEDIR)/verbose.mk
 
 
 _SRCPAGEDIRS   := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.d/,$(NONSO_MAN))
diff --git a/share/mk/check/catman.mk b/share/mk/check/catman.mk
index 2d4b1e619d..609540ba9e 100644
--- a/share/mk/check/catman.mk
+++ b/share/mk/check/catman.mk
@@ -17,8 +17,6 @@ include $(MAKEFILEDIR)/configure/build-depends/grep.mk
 include $(MAKEFILEDIR)/src.mk
 
 
-
-
 _CHECK_catman_grep := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.cat.grep,$(NONSO_MAN) $(NONSO_MDOC))
 _CHECK_catman := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.check-catman.touch,$(NONSO_MAN) $(NONSO_MDOC))
 
diff --git a/share/mk/configure/build-depends/checkpatch.mk b/share/mk/configure/build-depends/checkpatch.mk
index e1b11b1bc9..c3a369ec42 100644
--- a/share/mk/configure/build-depends/checkpatch.mk
+++ b/share/mk/configure/build-depends/checkpatch.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CHECKPATCH_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_CHECKPATCH_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/src.mk
+include $(MAKEFILEDIR)/configure/src.mk
 
 
 CHECKPATCH_CONF         := $(SYSCONFDIR)/checkpatch/checkpatch.conf
diff --git a/share/mk/configure/build-depends/clang-tidy.mk b/share/mk/configure/build-depends/clang-tidy.mk
index f0b9681f41..99d57cf51c 100644
--- a/share/mk/configure/build-depends/clang-tidy.mk
+++ b/share/mk/configure/build-depends/clang-tidy.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_TIDY_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_TIDY_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/src.mk
+include $(MAKEFILEDIR)/configure/src.mk
 
 
 CLANG_TIDY_CONF         := $(SYSCONFDIR)/clang-tidy/config.yaml
diff --git a/share/mk/configure/build-depends/cpp.mk b/share/mk/configure/build-depends/cpp.mk
index e7de318328..9c323bf5d1 100644
--- a/share/mk/configure/build-depends/cpp.mk
+++ b/share/mk/configure/build-depends/cpp.mk
@@ -8,7 +8,7 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPP_INCLUDED := 1
 
 include $(MAKEFILEDIR)/configure/build-depends/cc.mk
 include $(MAKEFILEDIR)/configure/build-depends/pkgconf.mk
-include $(MAKEFILEDIR)/verbose.mk
+include $(MAKEFILEDIR)/configure/verbose.mk
 
 
 DEFAULT_CPPFLAGS := $(shell $(PKGCONF_CMD) --cflags $(PKGCONF_LIBS) $(HIDE_ERR))
diff --git a/share/mk/configure/build-depends/cppcheck.mk b/share/mk/configure/build-depends/cppcheck.mk
index 4dfad8fddb..213a36a4bf 100644
--- a/share/mk/configure/build-depends/cppcheck.mk
+++ b/share/mk/configure/build-depends/cppcheck.mk
@@ -6,6 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPCHECK_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPCHECK_INCLUDED := 1
 
 
+include $(MAKEFILEDIR)/configure/src.mk
+
+
 CPPCHECK_SUPPRESS     := $(SYSCONFDIR)/cppcheck/cppcheck.suppress
 DEFAULT_CPPCHECKFLAGS := \
 	--enable=all \
diff --git a/share/mk/configure/build-depends/cpplint.mk b/share/mk/configure/build-depends/cpplint.mk
index 118212c4ee..13b42854da 100644
--- a/share/mk/configure/build-depends/cpplint.mk
+++ b/share/mk/configure/build-depends/cpplint.mk
@@ -6,6 +6,9 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPLINT_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPLINT_INCLUDED := 1
 
 
+include $(MAKEFILEDIR)/configure/src.mk
+
+
 CPPLINT_CONF         := $(SYSCONFDIR)/cpplint/cpplint.cfg
 DEFAULT_CPPLINTFLAGS :=
 EXTRA_CPPLINTFLAGS   :=
diff --git a/share/mk/configure/build-depends/ld.mk b/share/mk/configure/build-depends/ld.mk
index 0d1f37e4b1..f09884c1ca 100644
--- a/share/mk/configure/build-depends/ld.mk
+++ b/share/mk/configure/build-depends/ld.mk
@@ -9,7 +9,7 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_LD_INCLUDED := 1
 include $(MAKEFILEDIR)/configure/build-depends/cc.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
 include $(MAKEFILEDIR)/configure/build-depends/pkgconf.mk
-include $(MAKEFILEDIR)/verbose.mk
+include $(MAKEFILEDIR)/configure/verbose.mk
 
 
 LD := $(CC) $(CFLAGS)
diff --git a/share/mk/configure/build-depends/pkgconf.mk b/share/mk/configure/build-depends/pkgconf.mk
index 8a7cf05666..bbdf96f5dd 100644
--- a/share/mk/configure/build-depends/pkgconf.mk
+++ b/share/mk/configure/build-depends/pkgconf.mk
@@ -7,7 +7,7 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_PKGCONF_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/src.mk
-include $(MAKEFILEDIR)/version.mk
+include $(MAKEFILEDIR)/configure/version.mk
 
 
 # Compat
diff --git a/share/mk/configure/build-depends/sortman.mk b/share/mk/configure/build-depends/sortman.mk
deleted file mode 100644
index cbece9ec1e..0000000000
--- a/share/mk/configure/build-depends/sortman.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2024 Alejandro Colomar <alx@kernel.org>
-# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
-
-
-ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_SORTMAN_INCLUDED
-MAKEFILE_CONFIGURE_BUILD_DEPENDS_SORTMAN_INCLUDED := 1
-
-
-SORTMAN := $(srcdir)/scripts/sortman
-
-
-endif  # include guard
diff --git a/share/mk/configure/build-depends/tar.mk b/share/mk/configure/build-depends/tar.mk
index f4a404867c..678c4a00bb 100644
--- a/share/mk/configure/build-depends/tar.mk
+++ b/share/mk/configure/build-depends/tar.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_TAR_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_TAR_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/version.mk
+include $(MAKEFILEDIR)/configure/version.mk
 
 
 DEFAULT_TARFLAGS := \
diff --git a/share/mk/configure/directory_variables.mk b/share/mk/configure/directory_variables.mk
new file mode 100644
index 0000000000..af2745034f
--- /dev/null
+++ b/share/mk/configure/directory_variables.mk
@@ -0,0 +1,34 @@
+########################################################################
+# Copyright 2021-2023, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: GPL-3.0-or-later
+########################################################################
+
+
+ifndef MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_INCLUDED
+MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_INCLUDED := 1
+
+
+include $(MAKEFILEDIR)/src.mk
+
+
+builddir := .tmp
+
+
+DESTDIR     :=
+prefix      := /usr/local
+datarootdir := $(prefix)/share
+docdir      := $(datarootdir)/doc
+htmldir     := $(docdir)/html/man
+mandir      := $(datarootdir)/man
+
+
+htmlext  := .html
+
+
+$(foreach s, $(MANSECTIONS),                                                  \
+	$(eval man$(s)dir := $(mandir)/man$(s)))
+$(foreach s, $(MANSECTIONS),                                                  \
+	$(eval man$(s)ext := .$(s)))
+
+
+endif  # include guard
diff --git a/share/mk/configure/link_pages.mk b/share/mk/configure/link_pages.mk
new file mode 100644
index 0000000000..5764735277
--- /dev/null
+++ b/share/mk/configure/link_pages.mk
@@ -0,0 +1,20 @@
+########################################################################
+# Copyright 2023 Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: GPL-3.0-or-later
+########################################################################
+
+
+ifndef MAKEFILE_CONFIGURE_LINK_PAGES_INCLUDED
+MAKEFILE_CONFIGURE_LINK_PAGES_INCLUDED := 1
+
+
+LINK_PAGES := .so
+ifeq ($(LINK_PAGES),.so)
+else ifeq ($(LINK_PAGES),symlink)
+else
+$(warning "LINK_PAGES": "$(LINK_PAGES)")
+$(error Valid values for "LINK_PAGES": [".so", "symlink"])
+endif
+
+
+endif  # include guard
diff --git a/share/mk/configure/src.mk b/share/mk/configure/src.mk
new file mode 100644
index 0000000000..2a24f4e9d6
--- /dev/null
+++ b/share/mk/configure/src.mk
@@ -0,0 +1,16 @@
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CONFIGURE_SRC_INCLUDED
+MAKEFILE_CONFIGURE_SRC_INCLUDED := 1
+
+
+SYSCONFDIR := $(srcdir)/etc
+MANDIR     := $(srcdir)
+
+
+MANSECTIONS := $(patsubst $(MANDIR)/man%/, %, $(wildcard $(MANDIR)/man*/))
+
+
+endif  # include guard
diff --git a/share/mk/verbose.mk b/share/mk/configure/verbose.mk
index 3ad2da3023..22c2db01d0 100644
--- a/share/mk/verbose.mk
+++ b/share/mk/configure/verbose.mk
@@ -4,8 +4,8 @@
 ########################################################################
 
 
-ifndef MAKEFILE_VERBOSE_INCLUDED
-MAKEFILE_VERBOSE_INCLUDED := 1
+ifndef MAKEFILE_CONFIGURE_VERBOSE_INCLUDED
+MAKEFILE_CONFIGURE_VERBOSE_INCLUDED := 1
 
 
 HIDE_ERR := 2>/dev/null
diff --git a/share/mk/version.mk b/share/mk/configure/version.mk
index d359dfb72a..4f85929e1d 100644
--- a/share/mk/version.mk
+++ b/share/mk/configure/version.mk
@@ -4,12 +4,12 @@
 ########################################################################
 
 
-ifndef MAKEFILE_VERSION_INCLUDED
-MAKEFILE_VERSION_INCLUDED := 1
+ifndef MAKEFILE_CONFIGURE_VERSION_INCLUDED
+MAKEFILE_CONFIGURE_VERSION_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/configure/build-depends/git.mk
-include $(MAKEFILEDIR)/verbose.mk
+include $(MAKEFILEDIR)/configure/verbose.mk
 
 
 DISTNAME    := $(shell $(GIT) describe $(HIDE_ERR))
diff --git a/share/mk/compress.mk b/share/mk/configure/z.mk
index cd80912a19..25c65ed163 100644
--- a/share/mk/compress.mk
+++ b/share/mk/configure/z.mk
@@ -4,8 +4,8 @@
 ########################################################################
 
 
-ifndef MAKEFILE_COMPRESS_INCLUDED
-MAKEFILE_COMPRESS_INCLUDED := 1
+ifndef MAKEFILE_CONFIGURE_Z_INCLUDED
+MAKEFILE_CONFIGURE_Z_INCLUDED := 1
 
 
 Z :=
diff --git a/share/mk/dist.mk b/share/mk/dist.mk
index a5e792c8e7..0e8209d965 100644
--- a/share/mk/dist.mk
+++ b/share/mk/dist.mk
@@ -18,9 +18,10 @@ include $(MAKEFILEDIR)/configure/build-depends/lzip.mk
 include $(MAKEFILEDIR)/configure/build-depends/sed.mk
 include $(MAKEFILEDIR)/configure/build-depends/tar.mk
 include $(MAKEFILEDIR)/configure/build-depends/xz-utils.mk
+include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/verbose.mk
+include $(MAKEFILEDIR)/configure/version.mk
 include $(MAKEFILEDIR)/install/_.mk
-include $(MAKEFILEDIR)/version.mk
-include $(MAKEFILEDIR)/verbose.mk
 
 
 _DISTDIR := $(builddir)/dist
diff --git a/share/mk/install/_.mk b/share/mk/install/_.mk
index bf5dc3082e..1fb5b1690f 100644
--- a/share/mk/install/_.mk
+++ b/share/mk/install/_.mk
@@ -11,12 +11,6 @@ MAKEFILE_INSTALL_INCLUDED := 1
 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
 
 
-DESTDIR     :=
-prefix      := /usr/local
-datarootdir := $(prefix)/share
-docdir      := $(datarootdir)/doc
-
-
 %/:
 	+$(info	MKDIR	$@)
 	+$(INSTALL_DIR) $@
diff --git a/share/mk/install/html.mk b/share/mk/install/html.mk
index 9f836f76bf..6252b2fa6d 100644
--- a/share/mk/install/html.mk
+++ b/share/mk/install/html.mk
@@ -13,9 +13,7 @@ include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
 include $(MAKEFILEDIR)/install/_.mk
 
 
-htmldir  := $(docdir)
-htmldir_ := $(htmldir)/man
-_htmldir := $(DESTDIR)$(htmldir_)
+_htmldir := $(DESTDIR)$(htmldir)
 
 
 _htmlpages      := $(patsubst $(_HTMLDIR)/%,$(_htmldir)/%,$(_HTMLPAGES))
diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk
index c11ac069a7..aade04b704 100644
--- a/share/mk/install/man.mk
+++ b/share/mk/install/man.mk
@@ -8,7 +8,6 @@ ifndef MAKEFILE_INSTALL_MAN_INCLUDED
 MAKEFILE_INSTALL_MAN_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/compress.mk
 include $(MAKEFILEDIR)/configure/build-depends/bzip2.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
 include $(MAKEFILEDIR)/configure/build-depends/findutils.mk
@@ -18,26 +17,11 @@ include $(MAKEFILEDIR)/configure/build-depends/lzip.mk
 include $(MAKEFILEDIR)/configure/build-depends/moreutils.mk
 include $(MAKEFILEDIR)/configure/build-depends/sed.mk
 include $(MAKEFILEDIR)/configure/build-depends/xz-utils.mk
+include $(MAKEFILEDIR)/configure/z.mk
 include $(MAKEFILEDIR)/install/_.mk
 include $(MAKEFILEDIR)/src.mk
 
 
-LINK_PAGES := .so
-ifeq ($(LINK_PAGES),.so)
-else ifeq ($(LINK_PAGES),symlink)
-else
-$(warning "LINK_PAGES": "$(LINK_PAGES)")
-$(error Valid values for "LINK_PAGES": [".so", "symlink"])
-endif
-
-
-mandir := $(datarootdir)/man
-$(foreach s, $(MANSECTIONS),                                                  \
-	$(eval man$(s)dir := $(mandir)/man$(s)))
-$(foreach s, $(MANSECTIONS),                                                  \
-	$(eval man$(s)ext := .$(s)))
-
-
 _mandir := $(DESTDIR)$(mandir)
 $(foreach s, $(MANSECTIONS),                                                  \
 	$(eval _man$(s)dir := $(DESTDIR)$(man$(s)dir)))
diff --git a/share/mk/src.mk b/share/mk/src.mk
index c17f1c96b8..20c0037019 100644
--- a/share/mk/src.mk
+++ b/share/mk/src.mk
@@ -9,11 +9,11 @@ MAKEFILE_SRC_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/build-depends/sortman.mk
+include $(MAKEFILEDIR)/configure/src.mk
 
 
-SYSCONFDIR := $(srcdir)/etc
-MANDIR     := $(srcdir)
+SORTMAN := $(srcdir)/scripts/sortman
+
 
 MANEXT := \(\.[[:digit:]]\([[:alpha:]][[:alnum:]]*\)\?\>\|\.man\)\+\(\.man\|\.in\)*$
 
@@ -31,9 +31,6 @@ MANINTROPAGES := $(shell $(FIND) $(MANDIR)/* -type f \
 		| $(SED) 's,:,\\:,g')
 
 
-MANSECTIONS := $(patsubst $(MANDIR)/man%/, %, $(wildcard $(MANDIR)/man*/))
-
-
 $(foreach s, $(MANSECTIONS),                                                  \
 	$(eval MAN$(s)DIR := $(MANDIR)/man$(s)))
 
@@ -50,4 +47,16 @@ $(foreach s, $(MANSECTIONS),                                                  \
 				$(MANINTROPAGES)))))
 
 
+NONSO_MAN := $(shell $(FIND) $(MANDIR)/* -type f \
+		| $(GREP) '$(MANEXT)' \
+		| $(XARGS) $(GREP) -l '^\.TH ' \
+		| $(SORTMAN) \
+		| $(SED) 's,:,\\:,g')
+NONSO_MDOC := $(shell $(FIND) $(MANDIR)/* -type f \
+		| $(GREP) '$(MANEXT)' \
+		| $(XARGS) $(GREP) -l '^\.Dt ' \
+		| $(SORTMAN) \
+		| $(SED) 's,:,\\:,g')
+
+
 endif  # include guard