X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=repackage.mk;h=5e056d69c4d214a79bb1d72748f6eaf75df9b3a2;hb=29e50d95bd2711082e8f9a0738c2f0f82cdb56a8;hp=6f9eeec1af91c9ae9460414eb849e9b03ffbc146;hpb=a0fb115898aff321ee979e412049bd9f6da2b462;p=cc0%2Fargeo-build.git 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: