From b02de06d5a9d93e0403edf14be74ee35a290a165 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 6 Mar 2024 09:55:52 +0100 Subject: [PATCH] Debug repackage install --- repackage.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repackage.mk b/repackage.mk index b574a85..e71c644 100644 --- a/repackage.mk +++ b/repackage.mk @@ -19,13 +19,13 @@ REPACKAGED_CATEGORIES = $(foreach category, $(CATEGORIES),$(A2_OUTPUT)/$(categor 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 -D $(wildcard $(A2_OUTPUT)/$(category)/*.jar) $(A2_INSTALL_TARGET)/$(category)) @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 -D $(wildcard $(A2_OUTPUT)/$(category)/*.jar) $(A2_INSTALL_TARGET)/$(subst, $(TARGET_OS_CATEGORY_PREFIX)/,, $(category))) @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 -D $(wildcard $(A2_OUTPUT)/$(category)/*.jar) $(A2_NATIVE_INSTALL_TARGET)/$(subst, $(TARGET_ARCH_CATEGORY_PREFIX)/,, $(category))) @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 -D $(wildcard $(A2_OUTPUT)/$(category)/*.so) $(A2_NATIVE_INSTALL_TARGET);) @echo Installed arch binaries '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET) uninstall: -- 2.30.2