From 2decae095fa2f52213af1ccecec79daf8f338159 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 6 Mar 2024 17:10:26 +0100
Subject: [PATCH] Improve build and deployment

---
 rebuild/org.argeo.tp.utils/Makefile | 14 +++++---------
 sdk/argeo-build                     |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile
index 6217ae6..ad9857c 100644
--- a/rebuild/org.argeo.tp.utils/Makefile
+++ b/rebuild/org.argeo.tp.utils/Makefile
@@ -5,12 +5,6 @@ export NO_SDK_LEGAL := true
 
 A2_CATEGORY = org.argeo.tp.sys
 
-# GNU
-prefix ?= /usr/local
-exec_prefix ?= $(prefix)
-libdir ?= $(exec_prefix)/lib
-A2_NATIVE_INSTALL_TARGET ?= $(DESTDIR)$(libdir)/a2
-
 MBOX_JNI_SRC=jni/org_eclipse_angus_mail_mbox
 MBOX_TARGET_EXEC=libmbox.so
 
@@ -23,10 +17,12 @@ all: retrieve-angus-mbox osgi jni-angus-mbox
 install:
 	mkdir -p $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY)
 	# Angus mbox
-	cp -Rv $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.eclipse.angus.mail.mbox.$(ANGUS_BRANCH).jar $(A2_INSTALL_TARGET)/$(A2_CATEGORY)
-	cp -v $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY)
+	$(INSTALL) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY) $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.eclipse.angus.mail.mbox.$(ANGUS_BRANCH).jar
+	$(INSTALL) $(A2_NATIVE_INSTALL_TARGET) $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC)
 	
 uninstall: osgi-uninstall
+	$(RM) $(A2_NATIVE_INSTALL_TARGET)/$(MBOX_TARGET_EXEC)
+	@if [ -d $(A2_NATIVE_INSTALL_TARGET) ]; then find $(A2_NATIVE_INSTALL_TARGET) -empty -type d -delete; fi
 
 retrieve-angus-mbox: SRC_DIR=src/angus-mail
 retrieve-angus-mbox:
@@ -55,7 +51,7 @@ clean:
 
 DEP_CATEGORIES = org.argeo.tp.sys
 
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
+include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
 
 A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(shell uname -m)/$(A2_CATEGORY)
 
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 1076f42..6f8e29e 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 1076f424d4e7f785582c45d58bf8af988096891d
+Subproject commit 6f8e29e850f9fcfa5149e296e650355fab930752
-- 
2.30.2