diff options
| author | David Tardon <dtardon@redhat.com> | 2012-02-24 18:29:22 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-06 10:31:30 +0100 |
| commit | 371efa17fa22d1eeac89a6977f0ba734a612ab9a (patch) | |
| tree | 709c12820b305c6a39bb02732dc25a4f2e39bc8b /solenv | |
| parent | 66a7815451514121b86dd4b851d4aa74555fd5c8 (diff) | |
set localize.sdf path separately for each file
It cannot be done at the main target, because there is no guarantee that
all help (or properties) files are in one directory.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index d5a5173cdd6d..c9cf8848f7ca 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -159,15 +159,15 @@ 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 += $(foreach lang,$(subst -,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2))) -$(call gb_Extension_get_target,$(1)) : SDF2 := $(gb_SDFLOCATION)/$(subst $(SRCDIR),,$(dir $(3)))localize.sdf -$(call gb_Extension_get_target,$(1)) : $$(SDF2) +$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf +$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF) endif $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) $$(call gb_Output_announce,$(2),$(true),PRP,3) mkdir -p $$(dir $$@) && \ cp -f $$< $$@ \ - $(if $(strip $(gb_WITH_LANG)),&& $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2)) + $(if $(strip $(gb_WITH_LANG)),&& $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF)) endef @@ -175,8 +175,6 @@ endef define gb_Extension_localize_help ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(gb_Extension_LANGS),$(subst lang,$(lang),$(2))) -$(call gb_Extension_get_target,$(1)) : SDF3 := $(gb_SDFLOCATION)/$(subst $(SRCDIR),,$(dir $(3)))localize.sdf -$(call gb_Extension_get_target,$(1)) : $$(SDF3) $(foreach lang,$(gb_Extension_LANGS),$(call gb_Extension_localize_help_onelang,$(1),$(subst lang,$(lang),$(2)),$(3),$(lang))) endif @@ -184,10 +182,13 @@ endef define gb_Extension_localize_help_onelang $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2) -$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) $(gb_Extension_HELPEXTARGET) +$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf +$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF) +$(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET) +$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) $(call gb_Output_announce,$(2),$(true),XHP,3) mkdir -p $$(dir $$@) && \ - $(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$<) -o $$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF3) + $(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$<) -o $$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF) endef |