Use <project root>/doc instead of <project root> to house config

canonical · Oct 2, 2024 · 0b17f1e · 0b17f1e
1 parent c2b882d
commit 0b17f1e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/doc/sphinx/Makefile b/doc/sphinx/Makefile
@@ -38,8 +38,7 @@ full-help: $(VENVDIR)
 
 configure:
 	. $(VENV); \
-	cd ../../; \
-	cmake -B .build_doc -DMIR_ENABLE_TESTS=NO -DMIR_PLATFORM=x11;
+	cmake ../../ -B ../build_doc -DMIR_ENABLE_TESTS=NO -DMIR_PLATFORM=x11;
 
 # Shouldn't assume that venv is available on Ubuntu by default; discussion here:
 # https://bugs.launchpad.net/ubuntu/+source/python3.4/+bug/1290847
@@ -78,7 +77,7 @@ run: install
 
 # Doesn't depend on $(BUILDDIR) to rebuild properly at every run.
 html: install configure
-	@. $(VENV); echo $(shell pwd); cd ../../.build_doc/doc/sphinx; $(SPHINXBUILD) -b dirhtml "$(SOURCEDIR)" "$(BUILDDIR)" -w $(SPHINXDIR)/warnings.txt $(SPHINXOPTS)
+	@. $(VENV); echo $(shell pwd); cd ../build_doc/doc/sphinx; $(SPHINXBUILD) -b dirhtml "$(SOURCEDIR)" "$(BUILDDIR)" -w $(SPHINXDIR)/warnings.txt $(SPHINXOPTS)
 
 epub: install
 	. $(VENV); $(SPHINXBUILD) -b epub "$(SOURCEDIR)" "$(BUILDDIR)" -w $(SPHINXDIR)/warnings.txt $(SPHINXOPTS)
@@ -97,7 +96,7 @@ clean-doc:
 	rm -rf $(SPHINXDIR)/.doctrees
 
 spelling: html
-	. $(VENV) ; cd ../../.build_doc/doc/sphinx/; python3 -m pyspelling -c $(SPHINXDIR)/spellingcheck.yaml -j $(shell nproc)
+	. $(VENV) ; cd ../build_doc/doc/sphinx/; python3 -m pyspelling -c $(SPHINXDIR)/spellingcheck.yaml -j $(shell nproc)
 
 linkcheck: install
 	. $(VENV) ; $(SPHINXBUILD) -b linkcheck "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS)