X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=repackage.mk;h=28d5be77bff89dcb0fd340805d35a3b9a66bfddb;hb=80f033a18bf1f0ed924952f3b1187c19aaa253e5;hp=b574a85c7a38480f7cf49563e3a762be3a01e128;hpb=79f9e528bb50c7171f74fcd9a5e3efe4ad5dc7ea;p=cc0%2Fargeo-build.git

diff --git a/repackage.mk b/repackage.mk
index b574a85..28d5be7 100644
--- a/repackage.mk
+++ b/repackage.mk
@@ -15,17 +15,18 @@ ARGEO_REPACKAGE = $(JVM) -cp $(LOGGER_JAR):$(BNDLIB_JAR) $(ARGEO_BUILD_BASE)src/
 TODOS_REPACKAGE = $(foreach category, $(CATEGORIES),$(BUILD_BASE)/$(category)/to-repackage) 
 BUILD_BASE = $(SDK_BUILD_BASE)/$(shell basename $(SDK_SRC_BASE))
 REPACKAGED_CATEGORIES = $(foreach category, $(CATEGORIES),$(A2_OUTPUT)/$(category))
+INSTALL=install -m644 -D
 
 all: $(BUILD_BASE)/repackaged 
 
 install:
-	@$(foreach category, $(PORTABLE_CATEGORIES), install -D $(wildcard $(A2_OUTPUT)/$(category)/*.jar) $(A2_INSTALL_TARGET)/$(category))
+	$(foreach category, $(PORTABLE_CATEGORIES), $(INSTALL) $(wildcard $(A2_OUTPUT)/$(category)/*.jar) $(A2_INSTALL_TARGET)/$(category);$(LF))
 	@echo Installed portable jars '$(PORTABLE_CATEGORIES)' to $(A2_INSTALL_TARGET)
-	@$(foreach category, $(OS_CATEGORIES), install -D $(wildcard $(A2_OUTPUT)/$(category)/*.jar) $(A2_INSTALL_TARGET)/$(category))
+	$(foreach category, $(OS_CATEGORIES), $(INSTALL) $(wildcard $(A2_OUTPUT)/$(category)/*.jar) $(A2_INSTALL_TARGET)/$(category:$(TARGET_OS_CATEGORY_PREFIX)/%=%);$(LF))
 	@echo Installed OS-dependent jars '$(OS_CATEGORIES)' to $(A2_INSTALL_TARGET)
-	@$(foreach category, $(ARCH_CATEGORIES), install -D $(wildcard $(A2_OUTPUT)/$(category)/*.jar) $(subst, $(TARGET_ARCH_CATEGORY_PREFIX)/,, $(category)))
+	$(foreach category, $(ARCH_CATEGORIES), $(INSTALL) $(wildcard $(A2_OUTPUT)/$(category)/*.jar) $(A2_NATIVE_INSTALL_TARGET)/$(category:$(TARGET_ARCH_CATEGORY_PREFIX)/%=%);$(LF))
 	@echo Installed arch-dependent jars '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET)
-	@$(foreach category, $(ARCH_CATEGORIES), install -D $(wildcard $(A2_OUTPUT)/$(category)/*.so) $(A2_NATIVE_INSTALL_TARGET);)
+	$(foreach category, $(ARCH_CATEGORIES), $(INSTALL) $(wildcard $(A2_OUTPUT)/$(category)/*.so) $(A2_NATIVE_INSTALL_TARGET);$(LF))
 	@echo Installed arch binaries '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET)
 
 uninstall: