diff options
author | Mathias Bauer <mba@openoffice.org> | 2011-01-27 11:31:29 +0100 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2011-01-27 11:31:29 +0100 |
commit | bc4c58935145cf80e9a64a552d5b5a5509248630 (patch) | |
tree | 5b3b458e42c2b2effd7baff078bd4de0f29fb752 | |
parent | 26b3715705944b13fcd4e275e8e730035a7b4d15 (diff) |
CWS gnumake3: fix build breakage caused by missing sdf files for localized builds; fix localization of globlmn.hrc
-rw-r--r-- | svx/AllLangResTarget_svx.mk | 5 | ||||
-rw-r--r-- | svx/Library_svx.mk | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index 1fbce148dfe2..182833cd86e8 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -121,9 +121,10 @@ $(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(gb_SrsPart -mkdir -p $(WORKDIR)/inc/svx rm -f $(WORKDIR)/inc/svx/lastrun.mk echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk - $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ + $(call gb_Helper_abbreviate_dirs_native, \ + $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ -p svx \ - -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all + -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all) endif .PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 0ca0c80aad6c..944f5126a59f 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -30,10 +30,10 @@ $(eval $(call gb_Library_Library,svx)) $(eval $(call gb_Library_set_componentfile,svx,svx/util/svx)) $(eval $(call gb_Library_set_include,svx,\ - $$(SOLARINC) \ -I$(SRCDIR)/svx/inc \ -I$(SRCDIR)/svx/source/inc \ -I$(SRCDIR)/svx/inc/pch \ + $$(SOLARINC) \ -I$(OUTDIR)/inc/offuh \ )) |