diff options
| -rw-r--r-- | docs/Makefile | 18 | ||||
| -rw-r--r-- | docs/configure.in | 2 |
2 files changed, 14 insertions, 6 deletions
diff --git a/docs/Makefile b/docs/Makefile index 1571b7a8b1..2820089ac4 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -35,7 +35,7 @@ help: @echo " pdf,tex,dvi,ps,manpages{3,4},txt,pearson,fo,htmlhelp - Build specific output format" @echo " html - Build multi-file HTML versions" @echo " html-single - Build single-file HTML versions" - @echo " htmlman3 - Build HTML version of manpages" + @echo " htmlman3,htmlman4 - Build HTML version of manpages" @echo " undocumented - Output list of undocumented smb.conf options" @echo " samples - Extract examples" @echo " files - Extract other files" @@ -48,7 +48,7 @@ $(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard S # Pseudo targets all: $(TARGETS) -everything: manpages3 manpages4 pdf html-single html htmlman3 txt ps fo htmlhelp pearson +everything: manpages3 manpages4 pdf html-single html htmlman3 htmlman4 txt ps fo htmlhelp pearson release: manpages3 htmlman3 html pdf # Output format targets @@ -67,7 +67,8 @@ manpages4: $(patsubst $(MANPAGEDIR4)/%.xml,$(OUTPUTDIR)/manpages-4/%,$(MANPAGES4 pearson: $(PEARSONDIR)/Samba-HOWTO-Collection.xml pearson-verify: $(PEARSONDIR)/Samba-HOWTO-Collection.report.html plucker: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS)) -htmlman3: $(patsubst $(MANPAGEDIR3)/%.xml,$(HTMLDIR)/%.html,$(MANPAGES3)) $(HTMLDIR)/manpages.html +htmlman3: $(patsubst $(MANPAGEDIR3)/%.xml,$(HTMLDIR)/manpages-3/%.html,$(MANPAGES3)) $(HTMLDIR)/manpages-3/index.html +htmlman4: $(patsubst $(MANPAGEDIR4)/%.xml,$(HTMLDIR)/manpages-4/%.html,$(MANPAGES4)) $(HTMLDIR)/manpages-4/index.html html-single: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)) html: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html htmlhelp: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS)) @@ -87,12 +88,19 @@ $(DOCBOOKDIR)/manpages-4/%.xml: $(MANPAGEDIR4)/%.xml xslt/expand-sambadoc.xsl mkdir -p $(@D) $(XSLTPROC) --xinclude --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $< -$(DOCBOOKDIR)/manpages.xml: $(MANPAGES) xslt/manpage-summary.xsl +$(DOCBOOKDIR)/manpages-3/index.xml: $(MANPAGES3) xslt/manpage-summary.xsl mkdir -p $(@D) echo "<article><variablelist>" > $@ - $(XSLTPROC) xslt/manpage-summary.xsl $(MANPAGES) >> $@ + $(XSLTPROC) xslt/manpage-summary.xsl $(MANPAGES3) >> $@ echo "</variablelist></article>" >> $@ +$(DOCBOOKDIR)/manpages-4/index.xml: $(MANPAGES4) xslt/manpage-summary.xsl + mkdir -p $(@D) + echo "<article><variablelist>" > $@ + $(XSLTPROC) xslt/manpage-summary.xsl $(MANPAGES4) >> $@ + echo "</variablelist></article>" >> $@ + + # HTML docs $(HTMLDIR)/index.html: htmldocs.html diff --git a/docs/configure.in b/docs/configure.in index 9012a01a7f..d2057cac60 100644 --- a/docs/configure.in +++ b/docs/configure.in @@ -82,7 +82,7 @@ DOCS_DEFINE_TARGET(PDF, LATEX, [PDF versions], [pdf]) DOCS_DEFINE_TARGET(PS, LATEX, [PostScript versions], [ps]) DOCS_DEFINE_TARGET(HTML, ALL, [HTML versions], [html]) DOCS_DEFINE_TARGET(HTMLHELP, ALL, [HTML Help versions], [htmlhelp]) -DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman]) +DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman3 htmlman4]) DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages3 manpages4]) DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson]) DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker]) |