solenv/gbuild/ExtensionTarget.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
New commits: commit 5a898179a1533b2a625be73fa2b662f2aa742b75 Author: Zolnai Tamás <zolnaitamas2...@gmail.com> Date: Sun Oct 14 17:34:17 2012 +0200 Correct POFILE definition in ExtensionTarget.mk For help and help tree files. Result of $(or $(4),$(3)) can be only a single filename without relative path and this case $(dir...) retrun with './'. Otherwise $(dir...) return with the directory of the file with '/' ending. Change-Id: Ia636b314779b907796a3395a877e7bc7b1a47292 diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 752eba1..7c94e15 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -298,9 +298,9 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \ ifneq ($(strip $(gb_WITH_LANG)),) ifneq ($(filter-out en-US,$(5)),) $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ - POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(3))),.po,$(3)) + POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3))))) $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ - $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(3))),.po,$(3)) + $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3))))) endif endif $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ @@ -338,9 +338,9 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \ ifneq ($(strip $(gb_WITH_LANG)),) ifneq ($(filter-out en-US,$(5)),) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ - POFILE := $(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(4))),.po,$(4)) + POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3))))) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ - $(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst /$(lastword $(subst /, ,$(4))),.po,$(4)) + $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3))))) endif endif $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits