solenv/gbuild/AllLangHelp.mk | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit b547f6a2d7fa228f195963314de9d256cc1ec8e5
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Wed Jul 4 17:23:15 2018 +0200
move helpfiles pattern rule above the plaing get_target one
as mac's make might pick the one without the dependency on the direcotry
when trying to "make" that <module>.helpfiles target
Change-Id: I60a55be118bc9a41352dad94326247b02aef1dd6
Reviewed-on: https://gerrit.libreoffice.org/56960
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk
index c4a0865992d9..7edaf7d68407 100644
--- a/solenv/gbuild/AllLangHelp.mk
+++ b/solenv/gbuild/AllLangHelp.mk
@@ -18,6 +18,12 @@ gb_AllLangHelp_AUXDIR :=
$(gb_AllLangHelp_HELPDIR)/$(gb_AllLangHelp_AUXDIRNAME)
gb_AllLangHelp__get_helpname = $(1)/$(2)
+ifneq ($(ENABLE_HTMLHELP),)
+$(call gb_AllLangHelp_get_helpfiles_target,%): | \
+ $(dir $(call gb_AllLangHelp_get_helpfiles_target,%)).dir
+ touch $@
+endif
+
$(dir $(call gb_AllLangHelp_get_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
@@ -93,12 +99,6 @@ endif
endef
-ifneq ($(ENABLE_HTMLHELP),)
-$(call gb_AllLangHelp_get_helpfiles_target,%): | \
- $(dir $(call gb_AllLangHelp_get_helpfiles_target,%)).dir
- touch $@
-endif
-
# Add additional localized file(s) to the help pack.
#
# gb_AllLangHelp_add_localized_files module basedir file(s)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
