From 944da8f01a92a18afd1c46a8520613ac14ca83ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Tue, 3 May 2022 13:17:50 +0200 Subject: [PATCH] Remove constrained path on clean MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Brian Behlendorf Signed-off-by: Ahelenia Ziemiańska Closes #13316 --- Makefile.am | 4 ++++ contrib/pyzfs/Makefile.am | 3 ++- scripts/Makefile.am | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index bafc0ab2eae4..ebb385fabc06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,7 @@ CLEANFILES = EXTRA_DIST = INSTALL_DATA_HOOKS = ALL_LOCAL = +CLEAN_LOCAL = CHECKS = shellcheck checkbashisms include $(top_srcdir)/config/Rules.am @@ -87,6 +88,9 @@ distclean-local: -o -name '*.gcno' \) \ -type f -delete +PHONY += $(CLEAN_LOCAL) +clean-local: $(CLEAN_LOCAL) + PHONY += $(ALL_LOCAL) all-local: $(ALL_LOCAL) diff --git a/contrib/pyzfs/Makefile.am b/contrib/pyzfs/Makefile.am index 1bcbfd042bc1..505cd3c8b355 100644 --- a/contrib/pyzfs/Makefile.am +++ b/contrib/pyzfs/Makefile.am @@ -32,6 +32,7 @@ install-exec-local: --single-version-externally-managed \ --verbose -clean-local: +CLEAN_LOCAL += pyzfs-clean-local +pyzfs-clean-local: -$(RM) -r %D%/build/ %D%/pyzfs.egg-info/ endif diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 5a409484fed5..6f1dc9ccdba5 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -75,6 +75,10 @@ ALL_LOCAL += scripts-all-local scripts-all-local: %D%/common.sh -SCRIPT_COMMON=$< $(srcdir)/%D%/zfs-tests.sh -c +CLEAN_LOCAL += scripts-clean-local +scripts-clean-local: + -$(RM) -r tests/zfs-tests/bin/ + INSTALL_DATA_HOOKS += scripts-install-data-hook scripts-install-data-hook: %D%/common.sh.in Makefile -$(SED) -e '/^export BIN_DIR=/s|$$|$(bindir)|' \