[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Tue Nov 8 05:21:33 PST 2011


 desktop/Executable_soffice.bin.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f222b01170f57ca65ef28239dcf20c1f5a533f6c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Nov 8 14:19:36 2011 +0100

    there is no rule for the manifest, so we need to depend on the lib only
     - or maybe better: have an rule for manifest files on windows, instead of creating them as a sideeffect

diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index b32a444..776b84f 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -85,8 +85,8 @@ $(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin.manifest
 
 $(OUTDIR)/bin/soffice.bin.manifest : $(call gb_Executable_get_target,$(sofficebin))
 $(call gb_Executable_get_clean_target,$(sofficebin)) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
-$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin))).manifest $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin)))
-	$(call gb_Deliver_deliver,$<,$@)
+$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin)))
+	$(call gb_Deliver_deliver,$<.manifest,$@)
 
 .PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
 $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest :


More information about the Libreoffice-commits mailing list