From d8fded4778eae47e16e9fa48c7fa0635b08c7b79 Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Tue, 20 Nov 2018 12:01:48 +0100 Subject: [PATCH] rename html target --- docs/debian/docs | 2 +- docs/manuals/en/main-sphinx/Makefile | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/debian/docs b/docs/debian/docs index c1be4b2290e..da69c03cff2 100644 --- a/docs/debian/docs +++ b/docs/debian/docs @@ -1,5 +1,5 @@ manuals/en/main/bareos-manual-main-reference.pdf manuals/en/main/html/ -manuals/en/main-sphinx/html/ main-sphinx-html +manuals/en/main-sphinx/main-sphinx-html/ manuals/en/developers/html/ manuals/en/developers/latex/BareosDeveloperGuide.pdf diff --git a/docs/manuals/en/main-sphinx/Makefile b/docs/manuals/en/main-sphinx/Makefile index 00a846da8d6..9c8cf5d7704 100644 --- a/docs/manuals/en/main-sphinx/Makefile +++ b/docs/manuals/en/main-sphinx/Makefile @@ -15,8 +15,10 @@ BUILDDIR = . #.PHONY: help Makefile html: - @$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) -# @$(SPHINXBUILD) -M latexpdf "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + @$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(0) + [ -d main-sphinx-html ] && rm -Rf main-sphinx-html + mv html main-sphinx-html + @$(SPHINXBUILD) -M latexpdf "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) packageclean: rm -Rf $(BUILDDIR)/*