diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-24 04:52:24 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-24 04:52:24 +0000 |
| commit | 100d1b33f088fd38f69129afff7f9c2a1e084a57 (patch) | |
| tree | 5bf6b0bb14f22ecf0a5e9439fdd4c4758402400c /share/mk/dist/check | |
| parent | Releasing progress-linux version 6.7-2~progress7.99u1. (diff) | |
| download | manpages-100d1b33f088fd38f69129afff7f9c2a1e084a57.tar.xz manpages-100d1b33f088fd38f69129afff7f9c2a1e084a57.zip | |
Merging upstream version 6.8.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'share/mk/dist/check')
| -rw-r--r-- | share/mk/dist/check/_.mk | 11 | ||||
| -rw-r--r-- | share/mk/dist/check/diffoscope.mk | 6 | ||||
| -rw-r--r-- | share/mk/dist/check/dist.mk | 1 | ||||
| -rw-r--r-- | share/mk/dist/check/tar.mk | 6 |
4 files changed, 14 insertions, 10 deletions
diff --git a/share/mk/dist/check/_.mk b/share/mk/dist/check/_.mk index a24b8f8..d0a3b5d 100644 --- a/share/mk/dist/check/_.mk +++ b/share/mk/dist/check/_.mk @@ -6,8 +6,8 @@ ifndef MAKEFILE_DIST_CHECK_INCLUDED MAKEFILE_DIST_CHECK_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/directory_variables.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/realpath.mk +include $(MAKEFILEDIR)/configure/directory_variables/build.mk include $(MAKEFILEDIR)/configure/version.mk @@ -33,8 +33,11 @@ distcheck-%: $(_DISTCHECKSRCDIR) $(MK) | $$(@D)/ .PHONY: distcheck distcheck: distcheck-diffoscope distcheck: $(_DISTCHECKSRCDIR) $(MK) - $(info $(INFO_)MAKE lint build check install dist) - $(MAKE) $(_MAKE_OPTS) lint build check install dist \ + $(info $(INFO_)MAKE lint build install dist) + $(MAKE) $(_MAKE_OPTS) lint build install dist \ + 'INFO_= distcheck: ' + $(info $(INFO_)MAKE check) + $(MAKE) $(_MAKE_OPTS) check \ 'INFO_= distcheck: ' diff --git a/share/mk/dist/check/diffoscope.mk b/share/mk/dist/check/diffoscope.mk index 33bcf30..14058cb 100644 --- a/share/mk/dist/check/diffoscope.mk +++ b/share/mk/dist/check/diffoscope.mk @@ -6,9 +6,9 @@ ifndef MAKEFILE_DIST_CHECK_DIFFOSCOPE_INCLUDED MAKEFILE_DIST_CHECK_DIFFOSCOPE_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/build-depends/diffoscope.mk -include $(MAKEFILEDIR)/configure/directory_variables.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk +include $(MAKEFILEDIR)/configure/build-depends/diffoscope/diffoscope.mk +include $(MAKEFILEDIR)/configure/directory_variables/build.mk include $(MAKEFILEDIR)/dist/check/dist.mk include $(MAKEFILEDIR)/dist/tar.mk diff --git a/share/mk/dist/check/dist.mk b/share/mk/dist/check/dist.mk index ecd565b..1e28b06 100644 --- a/share/mk/dist/check/dist.mk +++ b/share/mk/dist/check/dist.mk @@ -6,7 +6,6 @@ ifndef MAKEFILE_DIST_CHECK_DIST_INCLUDED MAKEFILE_DIST_CHECK_DIST_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/build-depends/sed.mk include $(MAKEFILEDIR)/configure/version.mk include $(MAKEFILEDIR)/dist/check/_.mk include $(MAKEFILEDIR)/dist/check/tar.mk diff --git a/share/mk/dist/check/tar.mk b/share/mk/dist/check/tar.mk index bd28ce5..33f4cb0 100644 --- a/share/mk/dist/check/tar.mk +++ b/share/mk/dist/check/tar.mk @@ -6,8 +6,10 @@ ifndef MAKEFILE_DIST_CHECK_TAR_INCLUDED MAKEFILE_DIST_CHECK_TAR_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/build-depends/tar.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/cp.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/rm.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk +include $(MAKEFILEDIR)/configure/build-depends/tar/tar.mk include $(MAKEFILEDIR)/configure/version.mk include $(MAKEFILEDIR)/dist/check/_.mk include $(MAKEFILEDIR)/dist/tar.mk |