From 67f2b4a6e09873f846c5bd22084586e3a273f864 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 6 Mar 2024 12:38:10 +0100
Subject: [PATCH] Make uninstall more robust

---
 jni.mk       | 1 +
 repackage.mk | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jni.mk b/jni.mk
index 98ad5c8..920ecf4 100644
--- a/jni.mk
+++ b/jni.mk
@@ -40,6 +40,7 @@ install:
 
 uninstall:
 	$(RM) $(A2_NATIVE_INSTALL_TARGET)/$(TARGET_EXEC)
+	@if [ -d $(A2_NATIVE_INSTALL_TARGET) ]; then find $(A2_NATIVE_INSTALL_TARGET) -empty -type d -delete; fi
 
 # Sources
 SRCS := $(shell find $(SRC_DIRS) -name '*.cpp' -or -name '*.c' -or -name '*.s')
diff --git a/repackage.mk b/repackage.mk
index 38197cc..d4766da 100644
--- a/repackage.mk
+++ b/repackage.mk
@@ -39,8 +39,8 @@ uninstall:
 	 $(foreach libfile, $(wildcard $(A2_OUTPUT)/$(category)/*.so), $(RMDIR) $(A2_NATIVE_INSTALL_TARGET)/$(notdir $(libfile));$(LF)) \
 	)
 	@echo Uninstalled arch binaries \'$(ARCH_CATEGORIES)\' to $(A2_NATIVE_INSTALL_TARGET)
-	@find $(A2_INSTALL_TARGET) -empty -type d -delete
-	@find $(A2_NATIVE_INSTALL_TARGET) -empty -type d -delete
+	@if [ -d $(A2_INSTALL_TARGET) ]; then find $(A2_INSTALL_TARGET) -empty -type d -delete; fi
+	@if [ -d $(A2_NATIVE_INSTALL_TARGET) ]; then find $(A2_NATIVE_INSTALL_TARGET) -empty -type d -delete; fi
 
 .SECONDEXPANSION:
 # We use .SECONDEXPANSION and CATEGORIES_TO_REPACKAGE instead of directly CATEGORIES
-- 
2.30.2