solenv/gbuild/ExtensionTarget.mk | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 1474acef8a77926ae07d109256fecd2392b37510
Author: Andras Timar <ati...@suse.com>
Date: Fri Nov 23 18:16:32 2012 +0100
build XHP first, then TRE
Change-Id: Iab898ad984203e32df72f5ed643e3846a92548ee
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 472b50d..dbe219d 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) : \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
