diff options
| author | David Tardon <dtardon@redhat.com> | 2012-09-23 16:29:10 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-23 16:37:03 +0200 |
| commit | 751f3aea6805140775bb6ad28f92a1f2795373a6 (patch) | |
| tree | 3b312ed399626ea00326b441b0d8bc1a55588699 /solenv | |
| parent | 3d912e407770cb594b131c53a35af4fc0d04fb2a (diff) | |
fix build of dictionaries with l10n enabled
It seems that
foo : BAR := xyz
foo $$(BAR)
does not really work, i.e., it does not generate a dep on xyz, but
$$(BAR) expands into an empty string. It is unclear to me whether it is
a bug in make or it does not work by design. Info documentation for make
only says that target-specific variable _assignments_ are evaluated in
the context of the target, so previously defined target-specific
variables shall be in scope. There is no mention whether this should
work for use of such a variable too (like in the example above). I have
always expected it does; experimental evidence shows it does not .-)
Change-Id: If99bdcacea403aa925127dd993a7e94ed7d57ae4
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index d68f79e357c1..7c5d3d3910b4 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -132,7 +132,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, , $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml 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 : $$(SDF) +$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(gb_SDFLOCATION)/$(2)/localize.sdf endif $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \ @@ -219,7 +219,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(2) ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_ExtensionTarget_TRANS_LANGS)),$(subst en_US,$(lang),$(2))) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf -$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $$(SDF) +$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf endif $(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \ @@ -288,7 +288,8 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf -$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : $$(SDF) +$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ + $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ $(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_HELPEXTARGET)) | \ $(call gb_ExtensionTarget_get_workdir,$(1))/help/.dir @@ -320,7 +321,8 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf -$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : $$(SDF) +$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ + $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ $(if $(filter-out en-US,$(WITH_LANG)),$(gb_ExtensionTarget_UPDATETREETARGET)) | \ $(2)/$(4) |