Improve repackage install
authorMathieu Baudier <mbaudier@argeo.org>
Tue, 23 May 2023 10:00:07 +0000 (12:00 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Tue, 23 May 2023 10:00:07 +0000 (12:00 +0200)
repackage.mk

index 8c3beb6402576e38b47e251cdc83041c6f8e9485..fc296b64cf5937bdf019e3754a3469586a76c65c 100644 (file)
@@ -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