From f7e170670f40dc91d99e630650d33de764596394 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 30 Jan 2024 11:22:32 -0600 Subject: [PATCH] Use consistent variable naming conventions --- make_files/make_docs.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/make_files/make_docs.mk b/make_files/make_docs.mk index ab71041..6ee8936 100644 --- a/make_files/make_docs.mk +++ b/make_files/make_docs.mk @@ -105,8 +105,8 @@ LATEX_IMAGEDIR := $(LATEX_SRCDIR)/images LATEX_IMAGEDIR_PREREQ := $(DOC_CACHE)/latex_imagedir VIEW_DIR := $(SPHINX_DOCDIR)/views VIEW_DIR_PREREQ := $(DOC_CACHE)/view_dir -HTML_VIEW_DIR := $(HTML_SRCDIR)/views -LATEX_VIEW_DIR := $(LATEX_SRCDIR)/views +HTML_VIEWDIR := $(HTML_SRCDIR)/views +LATEX_VIEWDIR := $(LATEX_SRCDIR)/views # Exported because db/schemas/Makefile needs it to find the comments # in the docs. export HTML_SRCDIR @@ -212,11 +212,11 @@ CLEAN_DOC_TARGETS := $(DOCDIR)/requirements.txt.new \ # Prerequsites for html generation HTML_PREREQS := install-sphinx html_rst $(HTML_IMAGE_FILES) $(HTML_EPILOG) \ - $(HTML_STATIC_DIR) $(HTML_IMAGEDIR) $(HTML_VIEW_DIR) + $(HTML_STATIC_DIR) $(HTML_IMAGEDIR) $(HTML_VIEWDIR) # Prerequsites for latex (pdf) generation LATEX_PREREQS := latex_rst $(PNG_FILES) $(LATEX_EPILOG) \ - $(LATEX_IMAGEDIR_PREREQ) $(LATEX_VIEW_DIR) + $(LATEX_IMAGEDIR_PREREQ) $(LATEX_VIEWDIR) ## ## The available targets for make (make TARGET) are: @@ -438,7 +438,7 @@ $(HTML_IMAGEDIR) $(LATEX_IMAGEDIR): ln -s ../images $@ # Likewise with the SQL of view bodies -$(HTML_VIEW_DIR) $(LATEX_VIEW_DIR): +$(HTML_VIEWDIR) $(LATEX_VIEWDIR): ln -sf ../views $@ # -- 2.34.1