summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-07-04 17:23:15 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-07-04 20:56:09 +0200
commitb547f6a2d7fa228f195963314de9d256cc1ec8e5 (patch)
treec3374c1effc5a762c45c4e330ac3a8bd771debe2 /solenv
parent0c3f7154f4d2919f7d28a5db9578fc308f2c0d02 (diff)
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+LibreOffice@googlemail.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/AllLangHelp.mk12
1 files changed, 6 insertions, 6 deletions
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)