diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2012-09-30 19:01:17 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-09-30 18:32:07 +0000 |
| commit | ecc7820a93ca5a8f678d75e13c2e94b1115382e2 (patch) | |
| tree | c0e8ca03a03e51477997afb0c6d16c39f74fce47 | |
| parent | 9d300551b3dacd3693607e1015bea1461c173e1a (diff) | |
Use po for merge of readme.xrm
And delete old dmake rule
Change-Id: Ia0a18b79579337ceb40e8a440e028cf0c2867bf5
Reviewed-on: https://gerrit.libreoffice.org/738
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
| -rw-r--r-- | readlicense_oo/CustomTarget_readme.mk | 9 | ||||
| -rw-r--r-- | solenv/inc/rules.mk | 10 |
2 files changed, 6 insertions, 13 deletions
diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk index 6c74fc6a1e70..2871631d06a8 100644 --- a/readlicense_oo/CustomTarget_readme.mk +++ b/readlicense_oo/CustomTarget_readme.mk @@ -36,16 +36,19 @@ readlicense_oo_README_XRM := $(readlicense_oo_DIR)/readme.xrm $(readlicense_oo_DIR)/readme.xrm : \ $(SRCDIR)/readlicense_oo/docs/readme.xrm \ $(readlicense_XRMEXTARGET) \ - $(gb_SDFLOCATION)/readlicense_oo/docs/localize.sdf \ + $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs/readme.po) \ | $(readlicense_oo_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XRM,1) $(call gb_Helper_abbreviate_dirs, \ + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs/readme.po) > $${MERGEINPUT} && \ $(readlicense_XRMEXCOMMAND) \ -p readlicense_oo \ -i $< \ -o $@ \ - -m $(gb_SDFLOCATION)/readlicense_oo/docs/localize.sdf \ - -l all) + -m $${MERGEINPUT} \ + -l all && \ + rm -rf $${MERGEINPUT}) endif diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index b4561b9c7693..327955fde0f5 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -701,13 +701,3 @@ $(COMMONMISC)/$(TARGET)/%.uulf : $$(@:b).ulf @$(COPY) $< $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ @-$(RM) $@.$(INPATH) - -POLOCATION:=$(SRCDIR)$/translations/source -PORELPATH:=$(PRJNAME)$/$(PATH_IN_MODULE).po - -$(COMMONMISC)/$(TARGET)/%.xrm : %.xrm - $(COMMAND_ECHO)-$(MKDIR) $(@:d) - $(COMMAND_ECHO)-$(RM) $@ - $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(mktmp $(foreach,lang,$(subst,en-US, $(WITH_LANG)) $(POLOCATION)/$(lang)/$(PORELPATH))) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) |