[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - solenv/gbuild

[Michael Stahl]

 solenv/gbuild/CliAssembly.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f781a5faae6492de19589c20bd695b9cfe377d23
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 23 23:25:38 2017 +0100

    gbuild: CliAssembly: clean everything
    
    Change-Id: Ieaef37a8af808c9b1b981b4363e4dabfb4816457
    (cherry picked from commit c850db62618b9c53b21ae3e13bf52df91ea93bbd)
    Reviewed-on: https://gerrit.libreoffice.org/45219
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index 514bf368d63b..f9cd42289f84 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -63,7 +63,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		-keyfile:$(1).tmp.snk \
 		-link:$(CLI_ASSEMBLY_CONFIGFILE) \
 		$(if $(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) && \
-	rm -f $(1).tmp/snk && \
+	rm -f $(1).tmp.snk && \
 	touch $(1) \
 )
 endef
@@ -107,6 +107,7 @@ endef
 define gb_CliAssemblyTarget_set_configfile
 $(call gb_CliAssemblyTarget_get_target,$(1)) : CLI_ASSEMBLY_CONFIGFILE := $(2)
 $(call gb_CliAssemblyTarget_get_target,$(1)) : $(2)
+$(call gb_CliAssemblyTarget_get_clean_target,$(1)) : $(3)
 
 endef
 
@@ -176,7 +177,7 @@ endef
 
 define gb_CliAssembly__set_configfile
 $(call gb_CliConfigTarget_CliConfigTarget,$(2),$(3))
-$(call gb_CliAssembly__set_configfile_impl,$(1),$(call gb_CliConfigTarget_get_target,$(2)))
+$(call gb_CliAssembly__set_configfile_impl,$(1),$(call gb_CliConfigTarget_get_target,$(2)),$(call gb_CliConfigTarget_get_clean_target,$(2)))
 
 endef