From f9560005f4a577bed3e9ca2ea478ecd2ec68e5c7 Mon Sep 17 00:00:00 2001
From: Eric Espie <eric.espie@combodo.com>
Date: Thu, 10 Mar 2022 08:34:31 +0100
Subject: [PATCH] cleanup for linux

---
 .doc/UI/Makefile                 | 2 +-
 .doc/UI/README.md                | 6 ++++++
 .doc/UI/bin/generate_uiblock.php | 6 +++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.doc/UI/Makefile b/.doc/UI/Makefile
index d0c3cbf10..aeb3deae6 100644
--- a/.doc/UI/Makefile
+++ b/.doc/UI/Makefile
@@ -17,4 +17,4 @@ help:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) "$(SOURCEDIR)" "$(BUILDDIR)$@" $(SPHINXOPTS) $(O)
\ No newline at end of file
diff --git a/.doc/UI/README.md b/.doc/UI/README.md
index 7140ea78e..a91bc63fa 100644
--- a/.doc/UI/README.md
+++ b/.doc/UI/README.md
@@ -6,6 +6,12 @@ This documentation explains how to use UI blocks (new in 3.0) in twig based exte
 
 ## Generating the documentation
 
+Generating the documentation source from the actual code:
+
+```
+php bin/generate_uiblock.php
+```
+
 ### Windows users
 
 #### setup
diff --git a/.doc/UI/bin/generate_uiblock.php b/.doc/UI/bin/generate_uiblock.php
index 1aa181679..e33e67edf 100644
--- a/.doc/UI/bin/generate_uiblock.php
+++ b/.doc/UI/bin/generate_uiblock.php
@@ -536,7 +536,11 @@ EOF
 
 // Rebuild doc
 $sRootDir = dirname(__DIR__);
-shell_exec("$sRootDir/make.bat html");
+if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+	shell_exec("$sRootDir/make.bat html");
+} else {
+	shell_exec("$sRootDir/make html");
+}