diff options
| author | David Tardon <dtardon@redhat.com> | 2012-01-05 10:20:24 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-01-05 10:23:18 +0100 |
| commit | 42b50a1234f2047e4d4eb4c4da37919eb61a047e (patch) | |
| tree | a56f90bde35ef60f975263b15a66e3adef2767fb | |
| parent | ef17be8b006737c078a59635ae334a03301727ea (diff) | |
always put unlocalized properties files to the oxt
| -rw-r--r-- | solenv/gbuild/Extension.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 8e2e4097c7cd..3069408e2460 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -127,15 +127,18 @@ endef # localize .properties file # source file is copied to $(WORKDIR) define gb_Extension_localize_properties +$(call gb_Extension_get_target,$(1)) : FILES += $(2) ifneq ($(strip $(gb_WITH_LANG)),) -$(call gb_Extension_get_target,$(1)) : FILES += $(2) $(foreach lang,$(subst -,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2))) +$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2))) $(call gb_Extension_get_target,$(1)) : SDF2 := $(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf $(call gb_Extension_get_target,$(1)) : $$(SDF2) +endif $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_workdir,$(1))/$(2) $(call gb_Extension_get_workdir,$(1))/$(2) : $(3) $$(call gb_Output_announce,$(2),$(true),PRP,3) mkdir -p $$(dir $$@) cp -f $$< $$@ +ifneq ($(strip $(gb_WITH_LANG)),) $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2) endif |