dblatex-custom.sty: fix spacing in descriptionlabel

[pve-docs.git] / Makefile

diff --git a/Makefile b/Makefile
index 37726b846c03534fb3aa3a02b16df247115cd564..292cb5d998ddc0a12d785fcf9e6abba209316fa4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ DOC_PACKAGE=pve-docs
 MEDIAWIKI_PACKAGE=pve-docs-mediawiki
 
 # also update debian/changelog
-PKGREL=11
+PKGREL=13
 
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
@@ -16,9 +16,12 @@ GEN_DEB=${GEN_PACKAGE}_${DOCRELEASE}-${PKGREL}_${ARCH}.deb
 DOC_DEB=${DOC_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
 MEDIAWIKI_DEB=${MEDIAWIKI_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
 
+
 all: index.html
 
-.pve-doc-depends link-refs.json: $(wildcard *.adoc) scan-adoc-refs
+
+ADOC_SOURCES_GUESS=$(filter-out %-synopsis.adoc %-opts.adoc %-table.adoc, $(wildcard *.adoc))
+.pve-doc-depends link-refs.json: ${ADOC_SOURCES_GUESS} scan-adoc-refs
        ./scan-adoc-refs *.adoc --depends .pve-doc-depends.tmp > link-refs.json.tmp
        @cmp --quiet .pve-doc-depends .pve-doc-depends.tmp || mv .pve-doc-depends.tmp .pve-doc-depends
        @cmp --quiet link-refs.json link-refs.json.tmp || mv link-refs.json.tmp link-refs.json
@@ -87,20 +90,20 @@ README.html: README.adoc
 index: index.html
        $(BROWSER) index.html &
 
-chapter-index-table.adoc: gen-index-includes.pl
-       ./gen-index-includes.pl chapter-table >$@.tmp
+chapter-index-table.adoc: asciidoc-pve
+       ./asciidoc-pve chapter-table >$@.tmp
        mv $@.tmp $@
 
-man1-index-table.adoc: gen-index-includes.pl
-       ./gen-index-includes.pl man1page-table >$@.tmp
+man1-index-table.adoc: asciidoc-pve
+       ./asciidoc-pve man1page-table >$@.tmp
        mv $@.tmp $@
 
-man5-index-table.adoc: gen-index-includes.pl
-       ./gen-index-includes.pl man5page-table >$@.tmp
+man5-index-table.adoc: asciidoc-pve
+       ./asciidoc-pve man5page-table >$@.tmp
        mv $@.tmp $@
 
-man8-index-table.adoc: link-refs.json gen-index-includes.pl
-       ./gen-index-includes.pl man8page-table >$@.tmp
+man8-index-table.adoc: asciidoc-pve
+       ./asciidoc-pve man8page-table >$@.tmp
        mv $@.tmp $@
 
 index.html: index.adoc ${API_VIEWER_SOURCES} ${INDEX_INCLUDES}
@@ -117,7 +120,7 @@ pve-admin-guide.pdf: ${PVE_ADMIN_GUIDE_ADOCDEPENDS} docinfo.xml pve-admin-guide-
        inkscape -z -D --export-pdf=proxmox-logo.pdf images/proxmox-logo.svg
        inkscape -z -D --export-pdf=proxmox-ci-header.pdf images/proxmox-ci-header.svg
        grep ">Release ${DOCRELEASE}<" pve-admin-guide-docinfo.xml || (echo "wrong release in  pve-admin-guide-docinfo.xml" && false);
-       a2x -a docinfo -a docinfo1 -f pdf -L --dblatex-opts "-P latex.output.revhistory=0" --dblatex-opts "-P latex.class.options=12pt" --dblatex-opts "-P doc.section.depth=2 -P toc.section.depth=2" --dblatex-opts "-P doc.publisher.show=0 -s asciidoc/dblatex-custom.sty" pve-admin-guide.adoc
+       a2x -a docinfo -a docinfo1 -f pdf -L --dblatex-opts "-p ./asciidoc/pve-dblatex.xsl -s asciidoc/dblatex-custom.sty" pve-admin-guide.adoc
        rm proxmox-logo.pdf proxmox-ci-header.pdf
 
 pve-admin-guide.epub: ${PVE_ADMIN_GUIDE_ADOCDEPENDS}