[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
David Tardon
dtardon at kemper.freedesktop.org
Thu Jan 5 01:31:20 PST 2012
solenv/gbuild/Extension.mk | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit b047d494130a21b748a77e05f1843e0e897b6f8e
Author: David Tardon <dtardon at redhat.com>
Date: Thu Jan 5 10:20:24 2012 +0100
always put unlocalized properties files to the oxt
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 6044f4f..7f004f6 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
More information about the Libreoffice-commits
mailing list