[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - solenv/gbuild

[Christian Lohmaier]

 solenv/gbuild/AllLangHelp.mk |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4b475eb9f46082c5fd1e414f458da038264e6066
Author: Christian Lohmaier 
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 .helpfiles target

Change-Id: I60a55be118bc9a41352dad94326247b02aef1dd6
Reviewed-on: https://gerrit.libreoffice.org/56961
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

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
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/AllLangHelp.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f902094de5567c460013561e473dec302a651824
Author: Stephan Bergmann 
Date:   Thu Jun 7 13:55:25 2018 +0200

Missing dependency on directory

Change-Id: Icaf0f54d3487c8286486d265ebb9790f6b9e0910
Reviewed-on: https://gerrit.libreoffice.org/55419
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 8ab697786e29865953c3a725256f3b1eb1160ea6)
Reviewed-on: https://gerrit.libreoffice.org/55437

diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk
index b42dc692296a..c84714231507 100644
--- a/solenv/gbuild/AllLangHelp.mk
+++ b/solenv/gbuild/AllLangHelp.mk
@@ -104,7 +104,8 @@ endif
 endef
 
 ifneq ($(ENABLE_HTMLHELP),)
-$(call gb_AllLangHelp_get_helpfiles_target,%):
+$(call gb_AllLangHelp_get_helpfiles_target,%): | \
+$(dir $(call gb_AllLangHelp_get_helpfiles_target,%)).dir
touch $@
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits