From 29e50d95bd2711082e8f9a0738c2f0f82cdb56a8 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 6 Mar 2024 09:46:28 +0100 Subject: [PATCH] Improve repackage install --- repackage.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/repackage.mk b/repackage.mk index 6f9eeec..5e056d6 100644 --- a/repackage.mk +++ b/repackage.mk @@ -19,14 +19,13 @@ REPACKAGED_CATEGORIES = $(foreach category, $(CATEGORIES),$(A2_OUTPUT)/$(categor all: $(BUILD_BASE)/repackaged install: - @$(foreach category, $(PORTABLE_CATEGORIES), mkdir -p $(A2_INSTALL_TARGET)/$(category); cp $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category);) + @$(foreach category, $(PORTABLE_CATEGORIES), install -D $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category)) @echo Installed portable jars '$(PORTABLE_CATEGORIES)' to $(A2_INSTALL_TARGET) - @$(foreach category, $(OS_CATEGORIES), mkdir -p $(A2_INSTALL_TARGET)/$(category); cp $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category);) + @$(foreach category, $(OS_CATEGORIES), install -D $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category)) @echo Installed OS-dependent jars '$(OS_CATEGORIES)' to $(A2_INSTALL_TARGET) - mkdir -p $(A2_NATIVE_INSTALL_TARGET) - @$(foreach category, $(ARCH_CATEGORIES), mkdir -p $(A2_NATIVE_INSTALL_TARGET)/$(category); cp $(A2_OUTPUT)/$(category)/*.jar $(A2_NATIVE_INSTALL_TARGET)/$(category);) + @$(foreach category, $(ARCH_CATEGORIES), install -D $(A2_OUTPUT)/$(category)/*.jar $(subst, $(TARGET_ARCH_CATEGORY_PREFIX)/,, $(category))) @echo Installed arch-dependent jars '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET) - @$(foreach category, $(ARCH_CATEGORIES), cp $(A2_OUTPUT)/$(category)/*.so $(A2_NATIVE_INSTALL_TARGET);) + @$(foreach category, $(ARCH_CATEGORIES), install -D $(A2_OUTPUT)/$(category)/*.so $(A2_NATIVE_INSTALL_TARGET);) @echo Installed arch binaries '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET) uninstall: -- 2.30.2