diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-09 19:50:58 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-09 21:04:43 +0200 |
| commit | f98ffc5be6ec51149e9a44b366d14565d2598829 (patch) | |
| tree | f4b79fb7101ec84e884378b4c9de81f2080a0ecf /i18npool | |
| parent | badfd77af86647fa3fe4a38d4675d34b1d591dd6 (diff) | |
use gb_Helper_make_url here
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/CustomTarget_localedata.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index c5d23588ace0..c21fcd9ed5dc 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -34,17 +34,13 @@ $(call gb_CustomTarget_get_target,i18npool/localedata) : \ $(patsubst %.xml,$(IPLD)/localedata_%.cxx, \ $(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml))) -# TODO: move this to gbuild/ -my_file := file://$(if $(filter $(OS_FOR_BUILD),WNT),/) -my_components := component/sax/source/expatwrap/expwrap.component - $(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \ $(IPLD)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1) $(call gb_Helper_abbreviate_dirs_native, \ $(call gb_Helper_execute,saxparser) $* $< $@.tmp \ - $(my_file)$(IPLD)/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb \ - -env:LO_LIB_DIR=$(my_file)$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR) \ + $(call gb_Helper_make_url,$(IPLD)/saxparser.rdb) $(OUTDIR_FOR_BUILD)/bin/types.rdb \ + -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \ sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \ rm $@.tmp) @@ -58,6 +54,6 @@ $(IPLD)/saxparser.rdb : $(IPLD)/saxparser.input \ $(IPLD)/saxparser.input :| $(IPLD)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - echo '<list><filename>$(my_components)</filename></list>' > $@ + echo '<list><filename>component/sax/source/expatwrap/expwrap.component</filename></list>' > $@ # vim: set noet sw=4 ts=4: |