Make uninstall more robust

[cc0/argeo-build.git] / repackage.mk

diff --git a/repackage.mk b/repackage.mk
index e0ed18a57d654ec5bd9a6a1b51515d3b8d29991c..d4766da6598d31a0dc84d0e8599a7dfa93714191 100644 (file)
--- a/repackage.mk
+++ b/repackage.mk
@@ -39,10 +39,9 @@ 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
-       @rmdir --ignore-fail-on-non-empty $(A2_INSTALL_TARGET)
-       @find $(A2_NATIVE_INSTALL_TARGET) -empty -type d -delete
-       @rmdir --ignore-fail-on-non-empty $(A2_NATIVE_INSTALL_TARGET)
+       @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
 # so that we don't repackage a category if it hasn't changed