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

diff --git a/repackage.mk b/repackage.mk
index f68fc09..28d5be7 100644
--- a/repackage.mk
+++ b/repackage.mk
@@ -22,9 +22,9 @@ all: $(BUILD_BASE)/repackaged
 install:
 	$(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) $(wildcard $(A2_OUTPUT)/$(category)/*.jar) $(A2_INSTALL_TARGET)/$(patsubst,$(TARGET_OS_CATEGORY_PREFIX)/%,%,$(category));$(LF))
+	$(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) $(wildcard $(A2_OUTPUT)/$(category)/*.jar) $(A2_NATIVE_INSTALL_TARGET)/$(patsubst,$(TARGET_OS_CATEGORY_PREFIX)/%,%,$(category));$(LF))
+	$(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) $(wildcard $(A2_OUTPUT)/$(category)/*.so) $(A2_NATIVE_INSTALL_TARGET);$(LF))
 	@echo Installed arch binaries '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET)