From c1c1c78fdf005f3a985e399cdee3f7020b978fae Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 6 Mar 2024 07:05:53 +0100
Subject: [PATCH] Improve native install

---
 common.mk    | 12 +++++++++++-
 repackage.mk |  9 +++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/common.mk b/common.mk
index 46b0398..5ba68de 100644
--- a/common.mk
+++ b/common.mk
@@ -9,5 +9,15 @@ SYSLOGGER_BRANCH=$(build-major).$(build-minor)
 # GNU defaults
 prefix ?= /usr/local
 datarootdir ?= $(prefix)/share
+libdir ?= $(exec_prefix)/lib
 
-A2_INSTALL_TARGET ?= $(DESTDIR)$(datarootdir)/a2
\ No newline at end of file
+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)
+
+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
diff --git a/repackage.mk b/repackage.mk
index 5a14bb7..228f6ed 100644
--- a/repackage.mk
+++ b/repackage.mk
@@ -30,8 +30,13 @@ REPACKAGED_CATEGORIES = $(foreach category, $(CATEGORIES),$(A2_OUTPUT)/$(categor
 all: $(BUILD_BASE)/repackaged 
 
 install:
-	@$(foreach category, $(CATEGORIES), mkdir -p $(A2_INSTALL_TARGET)/$(category);  cp $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category);)
-	@echo Installed $(CATEGORIES) to $(A2_INSTALL_TARGET)
+	@$(foreach category, $(PORTABLE_CATEGORIES), mkdir -p $(A2_INSTALL_TARGET)/$(category);  cp $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category);)
+	@echo Installed $(PORTABLE_CATEGORIES) to $(A2_INSTALL_TARGET)
+	@$(foreach category, $(OS_CATEGORIES), mkdir -p $(A2_INSTALL_TARGET)/$(category);  cp $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category);)
+	@echo Installed $(OS_CATEGORIES) to $(A2_INSTALL_TARGET)
+	mkdir -p $(A2_NATIVE_INSTALL_TARGET)
+	@$(foreach category, $(ARCH_CATEGORIES), cp $(A2_OUTPUT)/$(category)/*.so $(A2_NATIVE_INSTALL_TARGET);)
+	@echo Installed $(ARCH_CATEGORIES) to $(A2_NATIVE_INSTALL_TARGET)
 
 uninstall:
 	@$(foreach category, $(CATEGORIES), rm -rf $(A2_INSTALL_TARGET)/$(category);)
-- 
2.30.2