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

[Andras Timar]

 svx/AllLangResTarget_svx.mk |    2 ++
 svx/Package_inc.mk          |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1c6155ac7ea38c0057f144582dd5c23c3a12ba76
Author: Andras Timar <atimar at novell.com>
Date:   Sun May 1 17:15:22 2011 +0200

    copy localized globlmn.hrc to $(OUTDIR)/inc/svx - fdo#36727
    
    otherwise other modules would include the en-US only version
    and strings in it would be unlocalized in the build

diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 3ae2664..8b97627 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -110,6 +110,7 @@ $(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
 	rm -f $(WORKDIR)/inc/svx/lastrun.mk
 else
 -include $(WORKDIR)/inc/svx/lastrun.mk
@@ -125,6 +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
 endif
 
 .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index d5ffc3c..9be0b4b 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -556,5 +556,4 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdllapi.h,svx/svxdllapi.h))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/colrctrl.hxx,svx/colrctrl.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdpage.hxx,svx/fmdpage.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtpitm.hxx,svx/sxmtpitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globlmn.hrc,globlmn_tmpl.hrc))