From c79e61de5b91a1a703f92a0007fa3bfe04cf2c00 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 6 Mar 2024 07:25:43 +0100 Subject: [PATCH] Improve native install --- common.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 -- 2.30.2