From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 6 Mar 2024 06:25:43 +0000 (+0100)
Subject: Improve native install
X-Git-Tag: v2.3.10~46
X-Git-Url: https://git.argeo.org/?p=cc0%2Fargeo-build.git;a=commitdiff_plain;h=c79e61de5b91a1a703f92a0007fa3bfe04cf2c00

Improve native install
---

diff --git a/common.mk b/common.mk
index 5ba68de..3c21fff 100644
--- a/common.mk
+++ b/common.mk
@@ -15,9 +15,12 @@ A2_INSTALL_TARGET ?= $(DESTDIR)$(datarootdir)/a2
 A2_NATIVE_INSTALL_TARGET ?= $(DESTDIR)$(libdir)/a2
 
 # OS-speciific
-OS_CATEGORY_PREFIX=lib/linux
-ARCH_CATEGORY_PREFIX=$(OS_CATEGORY_PREFIX)/$(shell uname -m)
+KNOWN_ARCHS ?= x86_64 aarch64
+TARGET_OS ?= linux
+TARGET_ARCH ?= $(shell uname -m)
 
-PORTABLE_CATEGORIES=$(filter-out $(OS_CATEGORY_PREFIX)/%, $(CATEGORIES))
-ARCH_CATEGORIES=$(filter $(ARCH_CATEGORY_PREFIX)/%, $(CATEGORIES))
-OS_CATEGORIES=$(filter-out $(ARCH_CATEGORY_PREFIX)/%, $(filter $(OS_CATEGORY_PREFIX)/%, $(CATEGORIES)))
\ No newline at end of file
+TARGET_OS_CATEGORY_PREFIX=lib/linux
+TARGET_ARCH_CATEGORY_PREFIX=$(TARGET_OS_CATEGORY_PREFIX)/$(TARGET_ARCH)
+PORTABLE_CATEGORIES=$(filter-out lib/%, $(CATEGORIES))
+ARCH_CATEGORIES=$(filter $(TARGET_ARCH_CATEGORY_PREFIX)/%, $(CATEGORIES))
+OS_CATEGORIES=$(filter-out $(foreach arch, $(KNOWN_ARCHS), $(TARGET_OS_CATEGORY_PREFIX)/$(arch)), $(filter $(TARGET_OS_CATEGORY_PREFIX)/%, $(CATEGORIES)))
\ No newline at end of file