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

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/TestHelpers.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7a98a2c69d0fc747e6d7f813c591b5bf79aa8d7d
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Tue Jul 16 20:02:52 2019 +0000
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat Jul 20 01:05:12 2019 +0200

    Don't error more_fonts on the clean target
    
    Regression from commit 368c996b24e0 ("Make font-based unit test
    depend on instdir fonts")
    
    Change-Id: Ie106894803b84430f9b7d9bfd97c420d6eb29506
    Reviewed-on: https://gerrit.libreoffice.org/75747
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/solenv/gbuild/TestHelpers.mk b/solenv/gbuild/TestHelpers.mk
index d2628a09b6c8..1cbe308dd0c9 100644
--- a/solenv/gbuild/TestHelpers.mk
+++ b/solenv/gbuild/TestHelpers.mk
@@ -10,6 +10,7 @@
 # This makes sure that more_fonts, opensymbol and fontconfig is installed
 define gb_TestHelpers_use_more_fonts
 
+ifneq ($(MAKECMDGOALS),clean)
 ifneq (,$$(filter MORE_FONTS,$$(BUILD_TYPE)))
 ifeq (,$$(filter more_fonts,$$(gb_Module_ALLMODULES)))
 
@@ -39,6 +40,7 @@ $(1): \
         $$(call gb_Package_get_files,extras_fontconfig))
 endif
 endif
+endif
 
 endef