diff options
author | Alejandro Colomar <alx@kernel.org> | 2024-02-22 12:19:28 +0100 |
---|---|---|
committer | Alejandro Colomar <alx@kernel.org> | 2024-02-25 10:50:52 +0100 |
commit | 8420e0e1278c0319bc3e5bc417a3dc12e53ae622 (patch) | |
tree | 7183e04d754a122b69928a719980e6a28e21bc7c | |
parent | 475bc2a7776006df6a069955d180708d4196b5e2 (diff) | |
download | man-pages-8420e0e1278c0319bc3e5bc417a3dc12e53ae622.tar.gz |
share/mk/: distcheck: Use temporary dirs within $builddir
Signed-off-by: Alejandro Colomar <alx@kernel.org>
-rw-r--r-- | share/mk/clean.mk | 5 | ||||
-rw-r--r-- | share/mk/configure/build-depends/coreutils.mk | 1 | ||||
-rw-r--r-- | share/mk/dist/check/_.mk | 3 | ||||
-rw-r--r-- | share/mk/dist/check/all.mk | 4 | ||||
-rw-r--r-- | share/mk/dist/check/build.mk | 14 | ||||
-rw-r--r-- | share/mk/dist/check/check.mk | 10 | ||||
-rw-r--r-- | share/mk/dist/check/dist.mk | 4 | ||||
-rw-r--r-- | share/mk/dist/check/install.mk | 9 | ||||
-rw-r--r-- | share/mk/dist/check/lint.mk | 6 | ||||
-rw-r--r-- | share/mk/dist/check/tar.mk | 11 |
10 files changed, 32 insertions, 35 deletions
diff --git a/share/mk/clean.mk b/share/mk/clean.mk index 8129be98ff..14a5ccce20 100644 --- a/share/mk/clean.mk +++ b/share/mk/clean.mk @@ -8,17 +8,12 @@ MAKEFILE_CLEAN_INCLUDED := 1 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk include $(MAKEFILEDIR)/configure/directory_variables.mk -include $(MAKEFILEDIR)/dist/check/tar.mk .PHONY: clean clean: $(info $(INFO_)RM -rf $(builddir)) $(RM) -rf $(builddir) - $(info $(INFO_)RM -rf $(TMPDIR1)) - $(RM) -rf $(TMPDIR1) - $(info $(INFO_)RM -rf $(TMPDIR2)) - $(RM) -rf $(TMPDIR2) endif # include guard diff --git a/share/mk/configure/build-depends/coreutils.mk b/share/mk/configure/build-depends/coreutils.mk index b3f50243a3..0338cae5d3 100644 --- a/share/mk/configure/build-depends/coreutils.mk +++ b/share/mk/configure/build-depends/coreutils.mk @@ -13,7 +13,6 @@ HEAD := head INSTALL := install LN := ln MKDIR := mkdir -MKTEMP := mktemp RM := rm SORT := sort TAC := tac diff --git a/share/mk/dist/check/_.mk b/share/mk/dist/check/_.mk index e12be3fec2..18716be862 100644 --- a/share/mk/dist/check/_.mk +++ b/share/mk/dist/check/_.mk @@ -9,6 +9,9 @@ MAKEFILE_DIST_CHECK_INCLUDED := 1 include $(MAKEFILEDIR)/configure/directory_variables.mk +_DISTCHECKDIR := $(builddir)/distcheck + + .PHONY: distcheck distcheck: \ $(builddir)/distcheck.all.touch \ diff --git a/share/mk/dist/check/all.mk b/share/mk/dist/check/all.mk index 114a48a77e..788991ea7b 100644 --- a/share/mk/dist/check/all.mk +++ b/share/mk/dist/check/all.mk @@ -9,7 +9,7 @@ MAKEFILE_DIST_CHECK_ALL_INCLUDED := 1 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk include $(MAKEFILEDIR)/configure/directory_variables.mk include $(MAKEFILEDIR)/configure/version.mk -include $(MAKEFILEDIR)/dist/check/tar.mk +include $(MAKEFILEDIR)/dist/check/_.mk $(builddir)/distcheck.all.touch: \ @@ -20,7 +20,7 @@ $(builddir)/distcheck.all.touch: \ $(builddir)/distcheck.build-book.touch \ $(builddir)/distcheck.lint-man.touch \ $(builddir)/distcheck.lint-mdoc.touch -$(builddir)/distcheck.all.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ +$(builddir)/distcheck.all.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/ #$(info $(INFO_)MAKE all) #$(MAKE) -C $< all \ # 'INFO_= all: ' diff --git a/share/mk/dist/check/build.mk b/share/mk/dist/check/build.mk index 18fa274a69..2c50aed209 100644 --- a/share/mk/dist/check/build.mk +++ b/share/mk/dist/check/build.mk @@ -11,7 +11,7 @@ include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk include $(MAKEFILEDIR)/configure/directory_variables.mk include $(MAKEFILEDIR)/configure/verbose.mk include $(MAKEFILEDIR)/configure/version.mk -include $(MAKEFILEDIR)/dist/check/tar.mk +include $(MAKEFILEDIR)/dist/check/_.mk include $(MAKEFILEDIR)/dist/tar.mk @@ -170,14 +170,14 @@ DISTCHECK_IGNORE_BUILD_PDF := \ $(_MANDIR)/man7/vdso.7.pdf.set -$(builddir)/distcheck.build-pre.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ +$(builddir)/distcheck.build-pre.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/ $(info $(INFO_)MAKE build-pre) $(MAKE) -C $< build-pre \ 'INFO_= build-pre: ' $(TOUCH) $@ $(builddir)/distcheck.build-catman.touch: $(builddir)/distcheck.build-pre.touch -$(builddir)/distcheck.build-catman.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ +$(builddir)/distcheck.build-catman.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/ $(info $(INFO_)MAKE build-catman) $(MAKE) -C $< -k build-catman \ 'INFO_= build-catman -k: ' $(HIDE_ERR) \ @@ -189,7 +189,7 @@ $(builddir)/distcheck.build-catman.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ $(TOUCH) $@ $(builddir)/distcheck.build-ps.touch: $(builddir)/distcheck.build-pre.touch -$(builddir)/distcheck.build-ps.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ +$(builddir)/distcheck.build-ps.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/ $(info $(INFO_)MAKE build-ps) $(MAKE) -C $< -k build-ps \ 'INFO_= build-ps -k: ' $(HIDE_ERR) \ @@ -201,7 +201,7 @@ $(builddir)/distcheck.build-ps.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ $(TOUCH) $@ $(builddir)/distcheck.build-pdf.touch: $(builddir)/distcheck.build-pre.touch -$(builddir)/distcheck.build-pdf.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ +$(builddir)/distcheck.build-pdf.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/ $(info $(INFO_)MAKE build-pdf) $(MAKE) -C $< -k build-pdf \ 'INFO_= build-pdf -k: ' $(HIDE_ERR) \ @@ -212,13 +212,13 @@ $(builddir)/distcheck.build-pdf.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ 'INFO_= build-pdf: ' $(TOUCH) $@ -$(builddir)/distcheck.build-html.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ +$(builddir)/distcheck.build-html.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/ $(info $(INFO_)MAKE build-html) $(MAKE) -C $< build-html \ 'INFO_= build-html: ' $(TOUCH) $@ -$(builddir)/distcheck.build-book.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ +$(builddir)/distcheck.build-book.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/ $(info $(INFO_)MAKE build-book) $(MAKE) -C $< -k build-book \ 'INFO_= build-book -k: ' $(HIDE_ERR) \ diff --git a/share/mk/dist/check/check.mk b/share/mk/dist/check/check.mk index bf47aff984..75992f860e 100644 --- a/share/mk/dist/check/check.mk +++ b/share/mk/dist/check/check.mk @@ -11,7 +11,7 @@ include $(MAKEFILEDIR)/configure/build-depends/tar.mk include $(MAKEFILEDIR)/configure/directory_variables.mk include $(MAKEFILEDIR)/configure/verbose.mk include $(MAKEFILEDIR)/configure/version.mk -include $(MAKEFILEDIR)/dist/check/tar.mk +include $(MAKEFILEDIR)/dist/check/_.mk DISTCHECK_IGNORE_CHECK_CATMAN := \ @@ -85,12 +85,12 @@ DISTCHECK_IGNORE_CHECK_CATMAN := \ $(builddir)/distcheck.check-catman.touch: \ $(builddir)/distcheck.build-catman.touch -$(builddir)/distcheck.check-catman.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ +$(builddir)/distcheck.check-catman.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/ $(info $(INFO_)MAKE check-catman) - $(MAKE) -C $< -k check-catman $(HIDE_ERR) \ + $(MAKE) -C $< -k check-catman \ 'INFO_= check-catman -k: ' $(HIDE_ERR) \ || $(TRUE) - $(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_CHECK_CATMAN) $(HIDE_ERR) \ + $(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_CHECK_CATMAN) \ 'INFO_= check-catman -i: ' $(HIDE_ERR) $(MAKE) -C $< check-catman \ 'INFO_= check-catman: ' @@ -98,7 +98,7 @@ $(builddir)/distcheck.check-catman.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ $(builddir)/distcheck.check.touch: \ $(builddir)/distcheck.check-catman.touch -$(builddir)/distcheck.check.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ +$(builddir)/distcheck.check.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/ $(info $(INFO_)MAKE check) $(MAKE) -C $< check \ 'INFO_= check: ' diff --git a/share/mk/dist/check/dist.mk b/share/mk/dist/check/dist.mk index 4a5c0d4cea..6306de9942 100644 --- a/share/mk/dist/check/dist.mk +++ b/share/mk/dist/check/dist.mk @@ -8,10 +8,10 @@ MAKEFILE_DIST_CHECK_DIST_INCLUDED := 1 include $(MAKEFILEDIR)/configure/build-depends/sed.mk include $(MAKEFILEDIR)/configure/version.mk -include $(MAKEFILEDIR)/dist/check/tar.mk +include $(MAKEFILEDIR)/dist/check/_.mk -REDIST := $(TMPDIR1)/$(DISTNAME)/.tmp/$(DISTNAME).tar +REDIST := $(_DISTCHECKDIR)/$(DISTNAME)/.tmp/$(DISTNAME).tar $(REDIST): %/.tmp/$(DISTNAME).tar: % | $$(@D)/ diff --git a/share/mk/dist/check/install.mk b/share/mk/dist/check/install.mk index 9147f961ce..d6279394e9 100644 --- a/share/mk/dist/check/install.mk +++ b/share/mk/dist/check/install.mk @@ -10,12 +10,15 @@ include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk include $(MAKEFILEDIR)/configure/build-depends/sed.mk include $(MAKEFILEDIR)/configure/directory_variables.mk include $(MAKEFILEDIR)/configure/version.mk -include $(MAKEFILEDIR)/dist/check/tar.mk +include $(MAKEFILEDIR)/dist/check/_.mk -$(builddir)/distcheck.install.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ +_DESTDIR := $(builddir)/destdir + + +$(builddir)/distcheck.install.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/ $(info $(INFO_)MAKE install) - $(MAKE) -C $< install DESTDIR=$(TMPDIR2) \ + $(MAKE) -C $< install DESTDIR=$(_DESTDIR) \ 'INFO_= install: ' $(TOUCH) $@ diff --git a/share/mk/dist/check/lint.mk b/share/mk/dist/check/lint.mk index 45fca77555..222e9ef1c3 100644 --- a/share/mk/dist/check/lint.mk +++ b/share/mk/dist/check/lint.mk @@ -12,7 +12,7 @@ include $(MAKEFILEDIR)/configure/build-depends/sed.mk include $(MAKEFILEDIR)/configure/directory_variables.mk include $(MAKEFILEDIR)/configure/verbose.mk include $(MAKEFILEDIR)/configure/version.mk -include $(MAKEFILEDIR)/dist/check/tar.mk +include $(MAKEFILEDIR)/dist/check/_.mk DISTCHECK_IGNORE_LINT_MAN := \ @@ -25,7 +25,7 @@ DISTCHECK_IGNORE_LINT_MAN := \ $(_MANDIR)/man8/zic.8.lint-man.mandoc.touch -$(builddir)/distcheck.lint-man.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ +$(builddir)/distcheck.lint-man.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/ $(info $(INFO_)MAKE lint-man) $(MAKE) -C $< -k lint-man \ 'INFO_= lint-man -k: ' $(HIDE_ERR) \ @@ -36,7 +36,7 @@ $(builddir)/distcheck.lint-man.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ 'INFO_= lint-man: ' $(TOUCH) $@ -$(builddir)/distcheck.lint-mdoc.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/ +$(builddir)/distcheck.lint-mdoc.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/ $(info $(INFO_)MAKE lint-mdoc) $(MAKE) -C $< lint-mdoc \ 'INFO_= lint-mdoc: ' diff --git a/share/mk/dist/check/tar.mk b/share/mk/dist/check/tar.mk index 3d0799307f..58e298a87b 100644 --- a/share/mk/dist/check/tar.mk +++ b/share/mk/dist/check/tar.mk @@ -9,21 +9,18 @@ MAKEFILE_DIST_CHECK_TAR_INCLUDED := 1 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk include $(MAKEFILEDIR)/configure/build-depends/tar.mk include $(MAKEFILEDIR)/configure/version.mk +include $(MAKEFILEDIR)/dist/check/_.mk include $(MAKEFILEDIR)/dist/tar.mk -TMPDIR1 := $(shell $(MKTEMP) -d) -TMPDIR2 := $(shell $(MKTEMP) -d) - - -$(TMPDIR1)/$(DISTNAME).tar: $(DISTFILE) | $$(@D)/ +$(_DISTCHECKDIR)/$(DISTNAME).tar: $(DISTFILE) | $$(@D)/ $(info $(INFO_)CP $@) $(CP) $< $@ -$(TMPDIR1)/$(DISTNAME): %: %.tar | $$(@D)/ +$(_DISTCHECKDIR)/$(DISTNAME): %: %.tar | $$(@D)/ $(info $(INFO_)TAR xf $<) cd $(dir $<) \ - && $(TAR) xf $< + && $(TAR) xf $(notdir $<) $(TOUCH) $@ |