[Libreoffice-commits] .: Branch 'libreoffice-3-4' - svx/AllLangResTarget_svx.mk

[Bjoern Michaelsen]

 svx/AllLangResTarget_svx.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit db2c381531a130a73ec61f17e96958d434e6c279
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu May 5 10:13:49 2011 +0200

    fdo#36727: use gb_Deliver_deliver to deliver to OUTDIR

diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 8b97627..85c9167 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -109,8 +109,8 @@ ifeq ($(strip $(WITH_LANG)),)
 $(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc
 	echo copying $@
 	-mkdir -p $(WORKDIR)/inc/svx
-	cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc
-	cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(OUTDIR)/inc/svx/globlmn.hrc
+	cp $< $@
+	$(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc)
 	rm -f $(WORKDIR)/inc/svx/lastrun.mk
 else
 -include $(WORKDIR)/inc/svx/lastrun.mk
@@ -126,7 +126,7 @@ $(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(gb_SrsPart
             $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
             -p svx \
             -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all)
-	cp $(WORKDIR)/inc/svx/globlmn.hrc $(OUTDIR)/inc/svx/globlmn.hrc
+	$(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc)
 endif
 
 .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean