summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-11-23 18:16:32 +0100
committerAndras Timar <atimar@suse.com>2012-11-23 18:16:46 +0100
commit1474acef8a77926ae07d109256fecd2392b37510 (patch)
tree1817d9f5e44f620abf204bbf697e9384553000dd /solenv
parent8f703e108acad813188f1698ab5be31981da017d (diff)
build XHP first, then TRE
Change-Id: Iab898ad984203e32df72f5ed643e3846a92548ee
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/ExtensionTarget.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 472b50d2c83f..dbe219d9f48e 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -320,6 +320,8 @@ define gb_ExtensionTarget__localize_helpfile_onelang
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : HELPFILES += $(3)
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \
$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3)
+$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)-xhp.done : \
+ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3)
ifneq ($(strip $(gb_WITH_LANG)),)
ifneq ($(filter-out en-US,$(5)),)
$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
@@ -342,7 +344,8 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
$(gb_ExtensionTarget_HELPEXCOMMAND) -i $$< -o $$@ -l $(5) \
-m $$$${MERGEINPUT} && \
rm -rf $$$${MERGEINPUT}, \
- cp $$< $$@))
+ cp $$< $$@)) && \
+ touch $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)-xhp.done
endef
@@ -369,6 +372,8 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
endif
endif
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
+ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)-xhp.done
+$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
$(gb_ExtensionTarget_TREEXTARGET) | \
$(2)/$(4)
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \