From 57e8de383ef9c647c6770bae262b56b835d7a15b Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 30 Jan 2024 11:25:36 -0600 Subject: [PATCH] Change name of view dir to avoid name conflict with rst source dirs --- doc/README | 2 +- make_files/make_docs.mk | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/README b/doc/README index a45b25d..03f98d0 100644 --- a/doc/README +++ b/doc/README @@ -6,7 +6,7 @@ https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#sections To include the statement used to generate a particular view use: -.. include:: /views/$SCHEMA/$VIEWNAME.sql +.. include:: /view_sql/$SCHEMA/$VIEWNAME.sql :code: sql Where $SCHEMA is the schema the view is in and $VIEWNAME is the name diff --git a/make_files/make_docs.mk b/make_files/make_docs.mk index 6ee8936..e8270b0 100644 --- a/make_files/make_docs.mk +++ b/make_files/make_docs.mk @@ -103,10 +103,10 @@ LATEX_SRCDIR := $(SPHINX_DOCDIR)/latex_src LATEX_SRCDIR_PREREQ := $(DOC_CACHE)/latex_src LATEX_IMAGEDIR := $(LATEX_SRCDIR)/images LATEX_IMAGEDIR_PREREQ := $(DOC_CACHE)/latex_imagedir -VIEW_DIR := $(SPHINX_DOCDIR)/views +VIEW_DIR := $(SPHINX_DOCDIR)/view_sql VIEW_DIR_PREREQ := $(DOC_CACHE)/view_dir -HTML_VIEWDIR := $(HTML_SRCDIR)/views -LATEX_VIEWDIR := $(LATEX_SRCDIR)/views +HTML_VIEWDIR := $(HTML_SRCDIR)/view_sql +LATEX_VIEWDIR := $(LATEX_SRCDIR)/view_sql # Exported because db/schemas/Makefile needs it to find the comments # in the docs. export HTML_SRCDIR @@ -439,7 +439,7 @@ $(HTML_IMAGEDIR) $(LATEX_IMAGEDIR): # Likewise with the SQL of view bodies $(HTML_VIEWDIR) $(LATEX_VIEWDIR): - ln -sf ../views $@ + ln -sf ../view_sql $@ # # The files sphinx builds for a pdf -- 2.34.1