From b7eed050d502f2da4dab789d734bd45b80355868 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 23 May 2023 12:00:07 +0200 Subject: [PATCH] Improve repackage install --- repackage.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/repackage.mk b/repackage.mk index 8c3beb6..fc296b6 100644 --- a/repackage.mk +++ b/repackage.mk @@ -30,10 +30,11 @@ REPACKAGED_CATEGORIES = $(foreach category, $(CATEGORIES),$(A2_OUTPUT)/$(categor all: $(BUILD_BASE)/repackaged install: - $(foreach category, $(CATEGORIES), mkdir -p $(A2_INSTALL_TARGET)/$(category); cp $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category);) + @$(foreach category, $(CATEGORIES), mkdir -p $(A2_INSTALL_TARGET)/$(category); cp $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category);) uninstall: - $(foreach category, $(CATEGORIES), rm -rf $(A2_INSTALL_TARGET)/$(category);) + @$(foreach category, $(CATEGORIES), rm -rf $(A2_INSTALL_TARGET)/$(category);) + find $(A2_INSTALL_TARGET) -empty -type d -delete .SECONDEXPANSION: # We use .SECONDEXPANSION and CATEGORIES_TO_REPACKAGE instead of directly CATEGORIES -- 2.30.2