summaryrefslogtreecommitdiff
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:43 +0200
commit4b475eb9f46082c5fd1e414f458da038264e6066 (patch)
tree2e8e9daa3b42d1ee13ed2ad14793086c9fc63878
parent867dec9f720b7f704aef4fd3d560b8015fc776a7 (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/56961 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-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 c84714231507..475e7c0b326c 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 $@))
@@ -103,12 +109,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 to the help pack.
#
# gb_AllLangHelp_add_localized_file module basedir file