diff --git a/docs/Makefile b/docs/Makefile index a4e67e95d55..f52a8fea45a 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,5 +1,5 @@ -SUBDIRS = manuals/en/main/ manuals/en/developers/ +SUBDIRS = manuals/en/new_main_reference/ manuals/en/developers/ manuals/en/main/ .PHONY: $(SUBDIRS) all: TARGET= diff --git a/docs/debian/docs b/docs/debian/docs index 10dc45e855c..65f22750837 100644 --- a/docs/debian/docs +++ b/docs/debian/docs @@ -1,3 +1,4 @@ manuals/en/main/bareos-manual-main-reference.pdf manuals/en/main/html/ -manuals/en/developers/html/ +manuals/en/developers/BareosDeveloperGuide/ +manuals/en/new_main_reference/BareosMainReference/ diff --git a/docs/manuals/en/developers/Makefile b/docs/manuals/en/developers/Makefile index 6add5725bef..c77906ba64c 100644 --- a/docs/manuals/en/developers/Makefile +++ b/docs/manuals/en/developers/Makefile @@ -6,7 +6,7 @@ SPHINXOPTS = SPHINXBUILD = sphinx-build SPHINXPROJ = BareosDeveloperGuide SOURCEDIR = source -BUILDDIR = . +BUILDDIR = BareosDeveloperGuide ## Put it first so that "make" without argument is like "make help". #help: diff --git a/docs/manuals/en/new_main_reference/Makefile b/docs/manuals/en/new_main_reference/Makefile index f0b59e43f5e..a6642196fa7 100644 --- a/docs/manuals/en/new_main_reference/Makefile +++ b/docs/manuals/en/new_main_reference/Makefile @@ -6,12 +6,21 @@ SPHINXOPTS = SPHINXBUILD = sphinx-build SPHINXPROJ = BareosMainReference SOURCEDIR = source -BUILDDIR = build +BUILDDIR = BareosMainReference + # Put it first so that "make" without argument is like "make help". +all: + @$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + #@$(SPHINXBUILD) -M latexpdf "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + help: @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) +check: + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + + .PHONY: help Makefile # Catch-all target: route all unknown targets to Sphinx using the new