Merge pull request #5855 from jameshcorbett/doc-conf-path

doc: add path to 'manpages' to conf.py
flux-framework · Apr 3, 2024 · 4598d41 · 4598d41
2 parents 5299547 + d7ee975
commit 4598d41
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -427,7 +427,6 @@ stderr_devnull_0 = >/dev/null 2>&1
 
 $(MAN_FILES): manpages.py conf.py $(RST_FILES)
 	$(sphinx_man) \
-	PYTHONPATH=$(PYTHONPATH):$(abs_srcdir) \
 	SPHINX_BUILDDIR=$(abs_builddir) $(PYTHON) \
 		-m sphinx $(sphinx_verbose_flags) -b man $(srcdir) ./man \
 		$(STDERR_DEVNULL)
@@ -440,7 +439,6 @@ $(MAN_FILES): manpages.py conf.py $(RST_FILES)
 .PHONY: html
 html: conf.py $(RST_FILES)
 	$(sphinx_html) \
-	PYTHONPATH=$(PYTHONPATH):$(abs_srcdir) \
 	SPHINX_BUILDDIR=$(abs_builddir) $(PYTHON) \
 		-m sphinx $(sphinx_verbose_flags) -b html $(srcdir) ./html \
 		$(STDERR_DEVNULL)

diff --git a/doc/conf.py b/doc/conf.py
@@ -22,6 +22,11 @@
 #
 import os
 import sys
+
+# add `manpages` directory to sys.path
+import pathlib
+sys.path.append(str(pathlib.Path(__file__).absolute().parent))
+
 from manpages import man_pages
 import docutils.nodes