projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
90a174d
)
Improve repackage install
author
Mathieu Baudier <mbaudier@argeo.org>
Tue, 23 May 2023 10:00:07 +0000
(12:00 +0200)
committer
Mathieu Baudier <mbaudier@argeo.org>
Tue, 23 May 2023 10:00:07 +0000
(12:00 +0200)
repackage.mk
patch
|
blob
|
history
diff --git
a/repackage.mk
b/repackage.mk
index 8c3beb6402576e38b47e251cdc83041c6f8e9485..fc296b64cf5937bdf019e3754a3469586a76c65c 100644
(file)
--- a/
repackage.mk
+++ b/
repackage.mk
@@
-30,10
+30,11
@@
REPACKAGED_CATEGORIES = $(foreach category, $(CATEGORIES),$(A2_OUTPUT)/$(categor
all: $(BUILD_BASE)/repackaged
install:
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:
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
.SECONDEXPANSION:
# We use .SECONDEXPANSION and CATEGORIES_TO_REPACKAGE instead of directly CATEGORIES