diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-09-05 12:40:38 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-04 13:13:49 +0000 |
| commit | 0d1047ff82d4320e22144447a9dc7a50c94d2769 (patch) | |
| tree | 46c498a28bb730c303a7587925d3880d6a05ee97 /solenv | |
| parent | 45b2346dcf6b695feb7ebeeb70e50b1c048853b6 (diff) | |
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 <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UnpackedTarball.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index fdebcb97f576..8079472bdfeb 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 |