From 254fe0454db3190d79758a690818c2cda3215b25 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Wed, 3 Mar 2021 16:08:34 +0100 Subject: [PATCH 1/2] Remove VERSION variable from docs Makefile --- docs/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 8f2eccac26..797f017ef0 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -8,7 +8,6 @@ SPHINXOPTS = SPHINXBUILD = -msphinx SPHINXPROJ = ReFrame SOURCEDIR = . -BUILDDIR = $(VERSION) RM = /bin/rm -rf TARGET_DOCS := \ @@ -45,10 +44,10 @@ latest: clean: @echo 'Removing directories' - -$(RM) $(TARGET_DOCS) doctrees + -$(RM) $(TARGET_DOCS) doctrees build_* $(TARGET_DOCS): Makefile - @$(PYTHON) $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + @$(PYTHON) $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "build_$(@)" $(SPHINXOPTS) $(O) From 198c0f8e4f16e3b9f75c45381722d051e2760c20 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Wed, 3 Mar 2021 16:19:23 +0100 Subject: [PATCH 2/2] Remove builddir --- docs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 797f017ef0..56b1e4fcbc 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -44,10 +44,10 @@ latest: clean: @echo 'Removing directories' - -$(RM) $(TARGET_DOCS) doctrees build_* + -$(RM) $(TARGET_DOCS) doctrees $(TARGET_DOCS): Makefile - @$(PYTHON) $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "build_$(@)" $(SPHINXOPTS) $(O) + @$(PYTHON) $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "" $(SPHINXOPTS) $(O)