solenv/gbuild/UnpackedTarball.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0d1047ff82d4320e22144447a9dc7a50c94d2769
Author: Andrzej J.R. Hunt <andr...@ahunt.org>
Date: Thu Sep 5 12:40:38 2013 +0100
Force removal of UNZIP_DIR when unpacking zip (gbuild).
mv only moves non-hidden files out of UNZIP_DIR, hence removal of
UNZIP_DIR can fail if there are hidden files remaining. This assumes
that hidden files aren't actually needed for our purposes.
This is a problem e.g. for libatomic_ops which contains a .gitignore
in it's top directory, causing the removal of UNZIP_DIR to fail.
Change-Id: Ia4a621b90bc4cc5fc15dd2a3ecc209734abc6269
Reviewed-on: https://gerrit.libreoffice.org/5808
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index fdebcb9..8079472 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -44,7 +44,7 @@ unzip \
$(if $(filter-out 0,$(UNPACKED_STRIP_COMPONENTS)),\
&& UNZIP_DIR=`ls $(UNPACKED_DIR)` \
&& mv $(UNPACKED_DIR)/$$UNZIP_DIR/* $(UNPACKED_DIR) \
- && rmdir $(UNPACKED_DIR)/$$UNZIP_DIR \
+ && rm -rf $(UNPACKED_DIR)/$$UNZIP_DIR \
)
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
