share/mk/: srcfix

Use a variable for the options passed to recursive make(1), to avoid
repetition.

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

7 files changed, 65 insertions, 48 deletions

diff --git a/share/mk/dist/check/_.mk b/share/mk/dist/check/_.mk
index e2180609ee..f3ef861916 100644
--- a/share/mk/dist/check/_.mk
+++ b/share/mk/dist/check/_.mk
@@ -17,6 +17,12 @@ _DISTCHECKDESTDIR  := $(_DISTCHECKDIR)/$(DISTNAME)_destdir
 _DISTCHECK_MANDIR  := $(_DISTCHECKBUILDDIR)/man
 
 
+_MAKE_OPTS = \
+	-C $< \
+	'builddir=$(_DISTCHECKBUILDDIR)' \
+	'DESTDIR=$(_DISTCHECKDESTDIR)'
+
+
 .PHONY: distcheck
 distcheck: \
 	$(builddir)/distcheck.all.touch \
diff --git a/share/mk/dist/check/all.mk b/share/mk/dist/check/all.mk
index 8c70774ed2..fdcf64bd11 100644
--- a/share/mk/dist/check/all.mk
+++ b/share/mk/dist/check/all.mk
@@ -22,8 +22,8 @@ $(builddir)/distcheck.all.touch: \
 	$(builddir)/distcheck.lint-mdoc.touch
 $(builddir)/distcheck.all.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	#$(info	$(INFO_)MAKE		all)
-	#$(MAKE) -C $< all \
-	#	'INFO_= all:			' builddir=$(_DISTCHECKBUILDDIR)
+	#$(MAKE) $(_MAKE_OPTS) all \
+	#	'INFO_= all:			'
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/check/build.mk b/share/mk/dist/check/build.mk
index cd2db2a664..fc9ffddad9 100644
--- a/share/mk/dist/check/build.mk
+++ b/share/mk/dist/check/build.mk
@@ -172,59 +172,66 @@ DISTCHECK_IGNORE_BUILD_PDF := \
 
 $(builddir)/distcheck.build-pre.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-pre)
-	$(MAKE) -C $< build-pre \
-		'INFO_= build-pre:		' builddir=$(_DISTCHECKBUILDDIR)
+	$(MAKE) $(_MAKE_OPTS) build-pre \
+		'INFO_= build-pre:		'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-catman.touch: $(builddir)/distcheck.build-pre.touch
 $(builddir)/distcheck.build-catman.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-catman)
-	$(MAKE) -C $< -k build-catman \
-		'INFO_= build-catman -k:	' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR) \
+	$(MAKE) $(_MAKE_OPTS) -k build-catman \
+		'INFO_= build-catman -k:	' \
+		$(HIDE_ERR) \
 	|| $(TRUE)
-	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_CATMAN) \
-		'INFO_= build-catman -i:	' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR)
-	$(MAKE) -C $< build-catman \
-		'INFO_= build-catman:		' builddir=$(_DISTCHECKBUILDDIR)
+	$(MAKE) $(_MAKE_OPTS) -i nothing $(DISTCHECK_IGNORE_BUILD_CATMAN) \
+		'INFO_= build-catman -i:	' \
+		$(HIDE_ERR)
+	$(MAKE) $(_MAKE_OPTS) build-catman \
+		'INFO_= build-catman:		'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-ps.touch: $(builddir)/distcheck.build-pre.touch
 $(builddir)/distcheck.build-ps.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-ps)
-	$(MAKE) -C $< -k build-ps \
-		'INFO_= build-ps -k:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR) \
+	$(MAKE) $(_MAKE_OPTS) -k build-ps \
+		'INFO_= build-ps -k:		' \
+		$(HIDE_ERR) \
 	|| $(TRUE)
-	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_PS) \
-		'INFO_= build-ps -i:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR)
-	$(MAKE) -C $< build-ps \
-		'INFO_= build-ps:		' builddir=$(_DISTCHECKBUILDDIR)
+	$(MAKE) $(_MAKE_OPTS) -i nothing $(DISTCHECK_IGNORE_BUILD_PS) \
+		'INFO_= build-ps -i:		' \
+		$(HIDE_ERR)
+	$(MAKE) $(_MAKE_OPTS) build-ps \
+		'INFO_= build-ps:		'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-pdf.touch: $(builddir)/distcheck.build-pre.touch
 $(builddir)/distcheck.build-pdf.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-pdf)
-	$(MAKE) -C $< -k build-pdf \
-		'INFO_= build-pdf -k:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR) \
+	$(MAKE) $(_MAKE_OPTS) -k build-pdf \
+		'INFO_= build-pdf -k:		' \
+		$(HIDE_ERR) \
 	|| $(TRUE)
-	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_PDF) \
-		'INFO_= build-pdf -i:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR)
-	$(MAKE) -C $< build-pdf \
-		'INFO_= build-pdf:		' builddir=$(_DISTCHECKBUILDDIR)
+	$(MAKE) $(_MAKE_OPTS) -i nothing $(DISTCHECK_IGNORE_BUILD_PDF) \
+		'INFO_= build-pdf -i:		' \
+		$(HIDE_ERR)
+	$(MAKE) $(_MAKE_OPTS) build-pdf \
+		'INFO_= build-pdf:		'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-html.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-html)
-	$(MAKE) -C $< build-html \
-		'INFO_= build-html:		' builddir=$(_DISTCHECKBUILDDIR)
+	$(MAKE) $(_MAKE_OPTS) build-html \
+		'INFO_= build-html:		'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-book.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-book)
-	$(MAKE) -C $< -k build-book \
-		'INFO_= build-book -k:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR) \
+	$(MAKE) $(_MAKE_OPTS) -k build-book \
+		'INFO_= build-book -k:		' \
+		$(HIDE_ERR) \
 	|| $(TRUE)
-	$(MAKE) -C $< build-book \
-		'INFO_= build-book:		' builddir=$(_DISTCHECKBUILDDIR)
+	$(MAKE) $(_MAKE_OPTS) build-book \
+		'INFO_= build-book:		'
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/check/check.mk b/share/mk/dist/check/check.mk
index 8b5b4de009..7159d260b8 100644
--- a/share/mk/dist/check/check.mk
+++ b/share/mk/dist/check/check.mk
@@ -87,21 +87,23 @@ $(builddir)/distcheck.check-catman.touch: \
 	$(builddir)/distcheck.build-catman.touch
 $(builddir)/distcheck.check-catman.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		check-catman)
-	$(MAKE) -C $< -k check-catman \
-		'INFO_= check-catman -k:	' builddir=$(_DISTCHECKBUILDDIR) $(HIDE_ERR) \
+	$(MAKE) $(_MAKE_OPTS) -k check-catman \
+		'INFO_= check-catman -k:	' \
+		$(HIDE_ERR) \
 	|| $(TRUE)
-	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_CHECK_CATMAN) \
-		'INFO_= check-catman -i:	' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR)
-	$(MAKE) -C $< check-catman \
-		'INFO_= check-catman:		' builddir=$(_DISTCHECKBUILDDIR)
+	$(MAKE) $(_MAKE_OPTS) -i nothing $(DISTCHECK_IGNORE_CHECK_CATMAN) \
+		'INFO_= check-catman -i:	' \
+		$(HIDE_ERR)
+	$(MAKE) $(_MAKE_OPTS) check-catman \
+		'INFO_= check-catman:		'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.check.touch: \
 	$(builddir)/distcheck.check-catman.touch
 $(builddir)/distcheck.check.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		check)
-	$(MAKE) -C $< check \
-		'INFO_= check:			' builddir=$(_DISTCHECKBUILDDIR)
+	$(MAKE) $(_MAKE_OPTS) check \
+		'INFO_= check:			'
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/check/dist.mk b/share/mk/dist/check/dist.mk
index 14e8e42ed8..d4d148008e 100644
--- a/share/mk/dist/check/dist.mk
+++ b/share/mk/dist/check/dist.mk
@@ -17,8 +17,8 @@ REDIST := $(_DISTCHECKBUILDDIR)/$(DISTNAME).tar
 
 $(REDIST): $(_DISTCHECKSRCDIR) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		dist)
-	$(MAKE) -C $< dist \
-		'INFO_= dist:			' builddir=$(_DISTCHECKBUILDDIR)
+	$(MAKE) $(_MAKE_OPTS) dist \
+		'INFO_= dist:			'
 
 
 endif  # include guard
diff --git a/share/mk/dist/check/install.mk b/share/mk/dist/check/install.mk
index f0aa77d6d7..d1549acdfa 100644
--- a/share/mk/dist/check/install.mk
+++ b/share/mk/dist/check/install.mk
@@ -15,8 +15,8 @@ include $(MAKEFILEDIR)/dist/check/_.mk
 
 $(builddir)/distcheck.install.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		install)
-	$(MAKE) -C $< install 'DESTDIR=$(_DISTCHECKDESTDIR)' \
-		'INFO_= install:		' builddir=$(_DISTCHECKBUILDDIR)
+	$(MAKE) $(_MAKE_OPTS) install \
+		'INFO_= install:		'
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/check/lint.mk b/share/mk/dist/check/lint.mk
index 7af239b8e3..b8f5be8b1c 100644
--- a/share/mk/dist/check/lint.mk
+++ b/share/mk/dist/check/lint.mk
@@ -27,19 +27,21 @@ DISTCHECK_IGNORE_LINT_MAN := \
 
 $(builddir)/distcheck.lint-man.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		lint-man)
-	$(MAKE) -C $< -k lint-man \
-		'INFO_= lint-man -k:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR) \
+	$(MAKE) $(_MAKE_OPTS) -k lint-man \
+		'INFO_= lint-man -k:		' \
+		$(HIDE_ERR) \
 	|| $(TRUE)
-	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_LINT_MAN) \
-		'INFO_= lint-man -i:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR)
-	$(MAKE) -C $< lint-man \
-		'INFO_= lint-man:		' builddir=$(_DISTCHECKBUILDDIR)
+	$(MAKE) $(_MAKE_OPTS) -i nothing $(DISTCHECK_IGNORE_LINT_MAN) \
+		'INFO_= lint-man -i:		' \
+		$(HIDE_ERR)
+	$(MAKE) $(_MAKE_OPTS) lint-man \
+		'INFO_= lint-man:		'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.lint-mdoc.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		lint-mdoc)
-	$(MAKE) -C $< lint-mdoc \
-		'INFO_= lint-mdoc:		' builddir=$(_DISTCHECKBUILDDIR)
+	$(MAKE) $(_MAKE_OPTS) lint-mdoc \
+		'INFO_= lint-mdoc:		'
 	$(TOUCH) $@