[Libreoffice-commits] help.git: CustomTarget_html.mk

[Stephan Bergmann]

 CustomTarget_html.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit cb3e183c7fa7bd926e6564e52b5a79b0a0d15262
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 2 10:25:33 2018 +0200

    Make --with-help=html work on Windows
    
    Change-Id: Ib8168a6ac770e81a8e5049d8d60e63aa04c7e64b
    Reviewed-on: https://gerrit.libreoffice.org/53722
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 8b6325a3e..5d913826c 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -99,14 +99,15 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/html.text : \
 		&& rm -rf $(dir $@)text \
 		&& find text -name "*.xhp" \
 		| while read xhp; do \
+			mkdir -p $$(dirname $(dir $@)$$xhp) && \
 			$(call gb_ExternalExecutable_get_command,xsltproc) \
 				--stringparam Language $* \
 				--stringparam local $(if $(HELP_ONLINE),'no','yes') \
-				--stringparam root `pwd`/ \
+				--stringparam root $(if $(filter WNT,$(OS)),$$(cygpath -m `pwd`),`pwd`)/ \
 				--stringparam productversion $(PRODUCTVERSION) \
 				-o $(dir $@)$${xhp%.xhp}.html \
 				$(SRCDIR)/helpcontent2/help3xsl/online_transform.xsl \
-				`pwd`/$$xhp \
+				$(if $(filter WNT,$(OS)),$$(cygpath -m `pwd`),`pwd`)/$$xhp \
 		; done \
 		&& touch $@ \
 	)