[Bf-docboard-svn] bf-manual: [7146] trunk/blender_docs: Makefiles: Use "SOURCEDIR" variable

[Aaron Carlisle]

Revision: 7146
          https://developer.blender.org/rBM7146
Author:   Blendify
Date:     2020-09-29 23:36:41 +0200 (Tue, 29 Sep 2020)
Log Message:
-----------
Makefiles: Use "SOURCEDIR" variable

Modified Paths:
--------------
    trunk/blender_docs/Makefile
    trunk/blender_docs/make.bat

Modified: trunk/blender_docs/Makefile
===================================================================
--- trunk/blender_docs/Makefile	2020-09-29 21:14:39 UTC (rev 7145)
+++ trunk/blender_docs/Makefile	2020-09-29 21:36:41 UTC (rev 7146)
@@ -18,14 +18,15 @@
 # ---------------
 
 
-SPHINXOPTS    = -j "$(NPROCS)"
-SPHINXBUILD   = sphinx-build
+SPHINXOPTS    ?= -j "$(NPROCS)"
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = ./manual
 BUILDDIR      = build
 
 # Internal variables.
-ALLSPHINXOPTS   = -d "$(BUILDDIR)/doctrees" $(SPHINXOPTS) manual
+ALLSPHINXOPTS   = -d "$(BUILDDIR)/doctrees" $(SPHINXOPTS)
 # the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(SPHINXOPTS) manual
+I18NSPHINXOPTS  = $(SPHINXOPTS)
 
 # full paths
 CHAPTERS_FULL:=$(filter %/, $(wildcard manual/*/))
@@ -88,7 +89,7 @@
 html: .FORCE .SPHINXBUILD_EXISTS
 	# './' (input), './html/' (output)
 	QUICKY_CHAPTERS=$(QUICKY_CHAPTERS) \
-	$(SPHINXBUILD) -b html $(SPHINXOPTS) ./manual "$(BUILDDIR)/html"
+	$(SPHINXBUILD) -b html $(SPHINXOPTS) $(SOURCEDIR) "$(BUILDDIR)/html"
 
 	@echo "To view, run:"
 	@echo "  "$(OPEN_CMD) $(shell pwd)"/$(BUILDDIR)/html/$(CONTENTS_HTML)"
@@ -98,12 +99,12 @@
 	# - Single thread because we run many builds at once.
 	# - Optimize to use less memory per-process.
 	PYTHONOPTIMIZE=2 \
-	$(SPHINXBUILD) -a -E -b html $(SPHINXOPTS) -j 1 ./manual "$(BUILDDIR)/html"
+	$(SPHINXBUILD) -a -E -b html $(SPHINXOPTS) -j 1 $(SOURCEDIR) "$(BUILDDIR)/html"
 
 epub: .FORCE .SPHINXBUILD_EXISTS
 	# './' (input), './epub/' (output)
 	QUICKY_CHAPTERS=$(QUICKY_CHAPTERS) \
-	$(SPHINXBUILD) -b epub $(SPHINXOPTS) ./manual "$(BUILDDIR)/epub"
+	$(SPHINXBUILD) -b epub $(SPHINXOPTS) $(SOURCEDIR) "$(BUILDDIR)/epub"
 
 	@echo "To view, run:"
 	@echo "  "$(OPEN_CMD) $(shell pwd)"/$(BUILDDIR)/epub/*.epub"
@@ -111,7 +112,7 @@
 singlehtml: .FORCE .SPHINXBUILD_EXISTS
 	# './' (input), './html/' (output)
 	QUICKY_CHAPTERS=$(QUICKY_CHAPTERS) \
-	$(SPHINXBUILD) -b singlehtml $(SPHINXOPTS) ./manual "$(BUILDDIR)/singlehtml"
+	$(SPHINXBUILD) -b singlehtml $(SPHINXOPTS) $(SOURCEDIR) "$(BUILDDIR)/singlehtml"
 
 	@echo "To view, run:"
 	@echo "  "$(OPEN_CMD) $(shell pwd)"/$(BUILDDIR)/singlehtml/$(CONTENTS_HTML)"
@@ -118,7 +119,7 @@
 
 pdf: .FORCE
 	QUICKY_CHAPTERS=$(QUICKY_CHAPTERS) \
-	$(SPHINXBUILD) -b latex ./manual "$(BUILDDIR)/latex"
+	$(SPHINXBUILD) -b latex $(SOURCEDIR) "$(BUILDDIR)/latex"
 	make -C "$(BUILDDIR)/latex" LATEXOPTS="-interaction nonstopmode"
 
 	@echo "To view, run:"
@@ -171,7 +172,6 @@
 	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
 
 
-
 # -----------------------------------------------------------------------------
 # Help for build targets
 help:

Modified: trunk/blender_docs/make.bat
===================================================================
--- trunk/blender_docs/make.bat	2020-09-29 21:14:39 UTC (rev 7145)
+++ trunk/blender_docs/make.bat	2020-09-29 21:36:41 UTC (rev 7146)
@@ -5,8 +5,9 @@
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
-set BUILDDIR=build
-set ALLSPHINXOPTS=-j %Number_Of_Processors% %SPHINXOPTS% manual
+set SOURCEDIR=./manual
+set BUILDDIR=_build
+set ALLSPHINXOPTS=-j %Number_Of_Processors% %SPHINXOPTS% %SOURCEDIR%
 set I18NSPHINXOPTS=%SPHINXOPTS%
 
 REM Default to HTML