From fd5837466349880df2bf0a212f517df493e7d1bf Mon Sep 17 00:00:00 2001
From: Jordan Yates <jordan@embeint.com>
Date: Mon, 23 Sep 2024 21:35:38 +1000
Subject: [PATCH] doc: get output folder from environment

Pull the output build folder from the environment, instead of hardcoding
the HTML output folder, which is wrong for the latex build.

Signed-off-by: Jordan Yates <jordan@embeint.com>
---
 doc/CMakeLists.txt | 6 +++---
 doc/conf.py        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 904ce96a6ac..bcabb520a79 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -151,7 +151,7 @@ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${GEN_DEVICETREE_
 
 add_doc_target(
   html
-  COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV}
+  COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV} OUTPUT_DIR=${DOCS_HTML_DIR}
   ${SPHINXBUILD}
     -b html
     -c ${DOCS_CFG_DIR}
@@ -208,7 +208,7 @@ add_dependencies(html-live devicetree)
 
 add_doc_target(
   latex
-  COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV}
+  COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV} OUTPUT_DIR=${DOCS_LATEX_DIR}
   ${SPHINXBUILD}
     -b latex
     -c ${DOCS_CFG_DIR}
@@ -260,7 +260,7 @@ endif()
 
 add_doc_target(
   linkcheck
-  COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV}
+  COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV} OUTPUT_DIR=${DOCS_LINKCHECK_DIR}
   ${SPHINXBUILD}
     -b linkcheck
     -c ${DOCS_CFG_DIR}
diff --git a/doc/conf.py b/doc/conf.py
index 8359d3d4049..17a73ec79ec 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -8,7 +8,7 @@ import re
 import textwrap
 
 ZEPHYR_BASE = Path(__file__).resolve().parents[1]
-ZEPHYR_BUILD = Path(os.environ.get("DOCS_HTML_DIR")).resolve()
+ZEPHYR_BUILD = Path(os.environ.get("OUTPUT_DIR")).resolve()
 
 # Add the '_extensions' directory to sys.path, to enable finding Sphinx
 # extensions within.