From 408acea40bf2e4dfaa5fc79779de0611b367128a Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Sun, 30 Sep 2012 16:02:39 +0200 Subject: Add correct input for helpex Helpex waits for a file which contains path of po file not a path directly Delete unneeded slash Change-Id: I890f6a51ebef1ae40647859b11ab4c46c02eb13b Reviewed-on: https://gerrit.libreoffice.org/733 Reviewed-by: Andras Timar Tested-by: Andras Timar --- solenv/gbuild/ExtensionTarget.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 481c4b993b23..559e0cfa36b8 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -300,9 +300,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))/$(subst /$(lastword $(subst /, ,$(3))),.po,$(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))/$(subst /$(lastword $(subst /, ,$(3))),.po,$(3)) endif endif $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ @@ -314,8 +314,11 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ $$(call gb_Helper_abbreviate_dirs, \ mkdir -p $$(dir $$@) && \ $(if $(filter-out en-US,$(5)), \ + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $$(POFILE) > $$$${MERGEINPUT} && \ $(gb_ExtensionTarget_HELPEXCOMMAND) -i $$< -o $$@ -l $(5) \ - -m $$(POFILE), \ + -m $$$${MERGEINPUT} && \ + rm -rf $$$${MERGEINPUT}, \ cp $$< $$@)) endef -- cgit