diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2012-09-30 17:54:37 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-09-30 18:31:08 +0000 |
| commit | 0359041aac89ef07325f6b8baa2d5ff304e833b5 (patch) | |
| tree | 5203e09fcc947c089464ec163ddf444ecb6e7782 /solenv/gbuild/ExtensionTarget.mk | |
| parent | 004f4fae87fe4fe3c31948d55206291b6de64ba9 (diff) | |
Corrections for merge
-Correct po type-checking
-Use new "lang" variable instead of
nonexistent one
-Add input parameter to ulfex
Change-Id: I1dc17363179d69d40144b6a998eb1bf223bd05e9
Reviewed-on: https://gerrit.libreoffice.org/736
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'solenv/gbuild/ExtensionTarget.mk')
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 559e0cfa36b8..4e53be562167 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -136,9 +136,9 @@ $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, , $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_ExtensionTarget_get_target,$(1)) : \ - POFILES := $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) + POFILES := $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \ - $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) + $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) endif $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \ @@ -225,9 +225,9 @@ $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(2) ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_ExtensionTarget_TRANS_LANGS)),$(subst en_US,$(lang),$(2))) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \ - POFILES := $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po) + POFILES := $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \ - $(foreach lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po) + $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst /%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po) endif $(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \ |