[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/Package.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d250dadbf20bd2c28a9d6c1e1aabfcf3e821cf5d
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Feb 28 11:43:25 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Feb 28 14:19:11 2020 +0100

    gb_Package_get_clean_target must rm recursively
    
    ...so that e.g. `make Package_infoplist.clean` on macOS does not fail with
    
    > rm: instdir/LibreOffice.app/Contents/Resources/en.lproj: is a directory
    
    Change-Id: I41c74ef118eeae567f88affed073d4e65f9d1bb2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89696
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index e283419cd5b9..90e22806c994 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -65,7 +65,7 @@ $(dir $(call gb_Package_get_target,%))%/.dir :
 $(call gb_Package_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),PKG,2)
 	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
-	&& cat $${RESPONSEFILE} | $(if $(filter WNT,$(OS)),env -i PATH="$$PATH") xargs $(if $(filter MACOSX,$(OS_FOR_BUILD)),-n 1000) rm -f \
+	&& cat $${RESPONSEFILE} | $(if $(filter WNT,$(OS)),env -i PATH="$$PATH") xargs $(if $(filter MACOSX,$(OS_FOR_BUILD)),-n 1000) rm -fr \
 	&& rm -f $${RESPONSEFILE}
 
 $(call gb_Package_get_preparation_target,%) :