From 7c6cf070db4fdbfcd6f807b25265521c134d4b0c Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@karlpinc.com>
Date: Tue, 9 May 2023 15:56:23 -0500
Subject: [PATCH] Move generated RST epilog files into doc/sphinx-doc/.

---
 .gitignore  | 2 --
 Makefile    | 5 ++---
 doc/conf.py | 9 +++++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 232d3aa..0e37677 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 # Built documentation
-doc/html_epilog.inc
-doc/latex_epilog.inc
 doc/sphinx-doc/
 
 # The python venv used by sphinx
diff --git a/Makefile b/Makefile
index f4bdd94..c79b928 100644
--- a/Makefile
+++ b/Makefile
@@ -127,8 +127,8 @@ LATEX_DIRS := $(sort $(dir $(LATEX_RST_FILES)))
 
 # The epilog
 SOURCE_EPILOG := $(M4_BASEDIR)/epilog.inc.m4
-HTML_EPILOG := $(PREFIX)/html_epilog.inc
-LATEX_EPILOG := $(PREFIX)/latex_epilog.inc
+HTML_EPILOG := $(SPHINX_PREFIX)/html_epilog.inc
+LATEX_EPILOG := $(SPHINX_PREFIX)/latex_epilog.inc
 
 # Where sphinx puts the pdf it builds
 SPHINX_PDF_TARGET := $(SPHINX_BUILT_LATEX)/$(PDF_TARGET)
@@ -150,7 +150,6 @@ endif
 
 CLEAN_TARGETS := $(SPHINX_PREFIX) \
                  $(HTML_RST_FILES) $(LATEX_RST_FILES) \
-                 $(HTML_EPILOG) $(LATEX_EPILOG) \
                  $(SVG_FILES) $(PNG_FILES) \
                  $(PDF_TARGET)
 
diff --git a/doc/conf.py b/doc/conf.py
index 1a811bd..2374e94 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -13,6 +13,7 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
+import pathlib
 
 
 # -- Project information -----------------------------------------------------
@@ -39,12 +40,12 @@ templates_path = ['_templates']
 exclude_patterns = []
 
 # Epilog to add to all RST files.  Puts a footer on and defines substitutions.
-# 
+# (The path sphinx uses is relative to this file.)
 if tags.has('html_epilog'):
-    epilog_path = 'html_epilog.inc'
+    epilog_file = 'html_epilog.inc'
 if tags.has('latex_epilog'):
-    epilog_path = 'latex_epilog.inc'
-with open(epilog_path, 'r') as epilog:
+    epilog_file = 'latex_epilog.inc'
+with open(pathlib.Path('sphinx-doc', epilog_file), 'r') as epilog:
     rst_epilog = epilog.read()
 
 # -- Options for HTML output -------------------------------------------------
-- 
2.34.1