summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-01-05 10:20:24 +0100
committerDavid Tardon <dtardon@redhat.com>2012-01-05 10:30:53 +0100
commitb047d494130a21b748a77e05f1843e0e897b6f8e (patch)
treef69955db9a2fb5148f0123d27355dfb96a0ac007 /solenv
parent5be4e4dc9d21d4b201a601e12b605eea007e1db0 (diff)
always put unlocalized properties files to the oxt
Signed-off-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/Extension.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 6044f4f657b3..7f004f6d866e 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