Remove empty base dirs when uninstalling

diff --git a/repackage.mk b/repackage.mk
index 38197cc1e2cfcbe1e943848fcdaccd3ce2ea64d5..e0ed18a57d654ec5bd9a6a1b51515d3b8d29991c 100644 (file)
--- a/repackage.mk
+++ b/repackage.mk
@@ -40,8 +40,9 @@ uninstall:
        )
        @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)
 .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