diff options
author | Andras Timar <atimar@novell.com> | 2011-05-01 17:15:22 +0200 |
---|---|---|
committer | Andras Timar <atimar@novell.com> | 2011-05-01 17:15:22 +0200 |
commit | 1c6155ac7ea38c0057f144582dd5c23c3a12ba76 (patch) | |
tree | 9a853dbc79244ade270c76b97a2a3281a5a4bbb8 | |
parent | acb9b419de15b1ffa42e678a8fb978799cf2089a (diff) |
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
-rw-r--r-- | svx/AllLangResTarget_svx.mk | 2 | ||||
-rw-r--r-- | svx/Package_inc.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index 3ae2664730..8b97627569 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 d5ffc3cb1a..9be0b4b5dc 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)) |