From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 23 May 2023 10:00:07 +0000 (+0200)
Subject: Improve repackage install
X-Git-Tag: v2.3.6~2
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=b7eed050d502f2da4dab789d734bd45b80355868;p=cc0%2Fargeo-build.git

Improve repackage install
---

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