Fix documentation build: manpages, links in the HTML documents.

Fixed manpages generation to properly create handle smb.conf parameters' titles
Changed HTML generator to include links for every smb.conf parameter.
Now we have correct linking between different HTML documents.

Signed-off-by: Alexander Bokovoy <ab@samba.org>
(cherry picked from commit 056935ff1f5fefc3ca42f7006182fc80c94d91ab)

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 5bdde51ff6ddc2c1055a00ee7a92191cc145079b..0f401d6c456cc4947ef6a083a33c6105e571ec8f 100644 (file)
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -59,7 +59,7 @@ clean:
        rm -f $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
                        $(patsubst %.svg,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
                        $(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
        rm -f $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
                        $(patsubst %.svg,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
                        $(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))

-       rm -f *.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
+       rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux

        rm -f *-images-html*
        rm -f *-images-latex-* latexfigures
        rm -f xslt/figures/*pdf
        rm -f *-images-html*
        rm -f *-images-latex-* latexfigures
        rm -f xslt/figures/*pdf

diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index 97c2b2201feacc6af9f32a4aa333907ddda03ed6..c0d66867424b975abe02a6f0845b7c9d4541ee7b 100644 (file)
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -94,4 +94,4 @@ fi
 
 AC_SUBST(TARGETS)
 
 
 AC_SUBST(TARGETS)
 

-AC_OUTPUT( Makefile.settings)
+AC_OUTPUT( Makefile.settings build/catalog.xml)