diff options
| author | David Tardon <dtardon@redhat.com> | 2012-10-24 09:46:26 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-24 09:46:26 +0200 |
| commit | 057ac009a338b1cca29c926bc90f53066078fde2 (patch) | |
| tree | d6bb8d526da5f3fdd8b82eaf5ef7e9ddab2973ed /solenv | |
| parent | 7cba3141cde4e6fdfdd34a3389964fe125bca745 (diff) | |
make l10n of extensions work again
Change-Id: I156f6bdf04d64abfdf482fd2bee13136528bff9b
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Dictionary.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Extension.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk index be81ef585bb2..989074821024 100644 --- a/solenv/gbuild/Dictionary.mk +++ b/solenv/gbuild/Dictionary.mk @@ -62,7 +62,7 @@ gb_Dictionary_extensionname = Dictionary/$(1) # # gb_Dictionary_Dictionary dictionary srcdir define gb_Dictionary_Dictionary -$(call gb_ExtensionTarget_ExtensionTarget,$(call gb_Dictionary_extensionname,$(1)),$(SRCDIR)/$(2)) +$(call gb_ExtensionTarget_ExtensionTarget,$(call gb_Dictionary_extensionname,$(1)),$(SRCDIR)/$(2),$(2)) $(call gb_Dictionary_add_root_file,$(1),$(2)/$(gb_Dictionary_CONFIGURATION_FILE)) $(call gb_Dictionary_get_target,$(1)) : $(call gb_ExtensionTarget_get_target,$(call gb_Dictionary_extensionname,$(1))) diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index d2f29fce45a2..ddf328b29bf9 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -28,7 +28,7 @@ # Extension class define gb_Extension_Extension -$(call gb_ExtensionTarget_ExtensionTarget,$(1),$(if $(filter nodefaults,$(3)),$(2),$(SRCDIR)/$(2))) +$(call gb_ExtensionTarget_ExtensionTarget,$(1),$(if $(filter nodefaults,$(3)),$(2),$(SRCDIR)/$(2)),$(if $(filter nodefaults,$(3)),,$(2))) $(if $(filter nodefaults,$(3)),,\ $(call gb_ExtensionTarget_use_default_license,$(1))) $(if $(filter nodefaults,$(3)),,\ diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index f9c1ec3a25da..61d0cec6bde7 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -130,21 +130,23 @@ $(call gb_ExtensionTarget_get_target,%) : \ # register target and clean target # add deliverable # add dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk) +# +# gb_ExtensionTarget_ExtensionTarget extension srcdir l10n-srcdir? define gb_ExtensionTarget_ExtensionTarget $(call gb_ExtensionTarget_get_target,$(1)) : DESCRIPTION := $(call gb_ExtensionTarget_get_target,$(1)) : FILES := META-INF description.xml $(call gb_ExtensionTarget_get_target,$(1)) : LICENSE := $(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(2) $(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(PLATFORMID) -$(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) +$(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(3))) $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \ $(2)/description.xml $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \ $(call gb_ExtensionTarget__get_preparation_target,$(1)) ifneq ($(strip $(gb_WITH_LANG)),) -$(call gb_ExtensionTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(2)/localize.sdf -$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(gb_SDFLOCATION)/$(2)/localize.sdf +$(if $(3),$(call gb_ExtensionTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(3)/localize.sdf) +$(if $(3),$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(gb_SDFLOCATION)/$(3)/localize.sdf) endif $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \ |