From d6695aa242d10d04d4b3eead9f7f1a08779ca580 Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@karlpinc.com>
Date: Mon, 18 Sep 2023 17:08:08 -0500
Subject: [PATCH] Move generated doc files into sphinx-doc directory
---
.gitignore | 6 ------
make_files/make_docs.mk | 11 +++++------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9d8a7f9..339774d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,12 +11,6 @@ db/set_timezone.sh
db/az_server_info.new
db/pg_settings.new
-# Built image files
-doc/images/
-
-# Built sql which becomes views
-doc/views/
-
# Built documentation
doc/sphinx-doc/
diff --git a/make_files/make_docs.mk b/make_files/make_docs.mk
index 80c57e4..46e1c92 100644
--- a/make_files/make_docs.mk
+++ b/make_files/make_docs.mk
@@ -92,7 +92,7 @@ HTML_SRCDIR := $(SPHINX_DOCDIR)/$(HTML_SRCDIR)
HTML_IMAGEDIR := $(HTML_SRCDIR)/images
LATEX_SRCDIR := $(SPHINX_DOCDIR)/latex_src
LATEX_IMAGEDIR := $(LATEX_SRCDIR)/images
-VIEW_DIR := $(DOCDIR)/views
+VIEW_DIR := $(SPHINX_DOCDIR)/views
HTML_VIEW_DIR := $(HTML_SRCDIR)/views
LATEX_VIEW_DIR := $(LATEX_SRCDIR)/views
@@ -162,7 +162,7 @@ SPHINX_PDF_LETTER_TARGET := $(SPHINX_BUILT_LATEX_LETTER)/$(PDF_NAME)
# Image targets
INKSCAPE_BASEDIR := $(DOCDIR)/diagrams/
-IMAGES_BASEDIR := $(DOCDIR)/images/
+IMAGES_BASEDIR := $(SPHINX_DOCDIR)/images/
INKSCAPE_FILES := $(wildcard $(INKSCAPE_BASEDIR)*.svg)
PARTIAL_PATHS := $(subst $(INKSCAPE_BASEDIR),$(IMAGES_BASEDIR), \
@@ -184,8 +184,7 @@ CLEAN_DOC_TARGETS := $(DOCDIR)/requirements.txt.new \
$(SPHINX_DOCDIR) \
$(HTML_RST_FILES) $(LATEX_RST_FILES) \
$(SVG_FILES) $(PNG_FILES) \
- $(PDF_A4_TARGET) $(PDF_LETTER_TARGET) \
- $(IMAGES_BASEDIR) $(VIEW_DIR)
+ $(PDF_A4_TARGET) $(PDF_LETTER_TARGET)
# Prerequsites for html generation
HTML_PREREQS := install-sphinx html_rst $(HTML_IMAGE_FILES) $(HTML_EPILOG) \
@@ -367,11 +366,11 @@ $(LATEX_DIRS) $(HTML_DIRS) $(HTML_SRCDIR) $(LATEX_SRCDIR) \
# we don't want relative paths. So symlink the image dir into
# the sphinx-doc dir.
$(HTML_IMAGEDIR) $(LATEX_IMAGEDIR):
- ln -s ../../images $@
+ ln -s ../images $@
# Likewise with the SQL of view bodies
$(HTML_VIEW_DIR) $(LATEX_VIEW_DIR):
- ln -s ../../views $@
+ ln -s ../views $@
#
# The files sphinx builds for a pdf
--
2.34.1