bump version to 4.3-7

[pve-docs.git] / Makefile

diff --git a/Makefile b/Makefile
index 36a6377fc2bb88b1ccdbd9adccc59f04ad42ad63..db7c9492d6656cfc7fc6d92929d53852d6774d22 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 DGDIR=.
+ASCIIDOC_PVE=./asciidoc-pve
 
 include ./pve-doc-generator.mk
 
@@ -7,7 +8,7 @@ DOC_PACKAGE=pve-docs
 MEDIAWIKI_PACKAGE=pve-docs-mediawiki
 
 # also update debian/changelog
-PKGREL=5
+PKGREL=7
 
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
@@ -112,7 +113,8 @@ SYSADMIN_PARTS=                                     \
        system-software-updates                 \
        pve-disk-health-monitoring              \
        local-lvm                               \
-       local-zfs
+       local-zfs                               \
+       system-timesync
 
 SYSADMIN_SOURCES=                              \
        $(addsuffix .adoc, ${SYSADMIN_PARTS})   \
@@ -174,10 +176,6 @@ pve-docs-mediawiki-import: pve-docs-mediawiki-import.in link-refs.json
        chmod +x pve-docs-mediawiki-import.tmp
        mv pve-docs-mediawiki-import.tmp pve-docs-mediawiki-import
 
-test: asciidoc-pve
-       ./asciidoc-pve compile-wiki-section pve-package-repos.adoc
-       #./asciidoc-pve compile-wiki-chapter ha-manager.adoc
-
 WIKI_IMPORTS=                                                                  \
        pve-usbstick-plain.html                                                 \
        getting-help-plain.html                                                 \
@@ -213,23 +211,23 @@ all: index.html
 
 chapter-sysadmin.html sysadmin-plain.html: ${SYSADMIN_SOURCES}
 
-chapter-%.html: %.adoc ${PVE_COMMON_DOC_SOURCES}
-       asciidoc ${ADOC_STDARG} -a toc -o $@ $*.adoc
+chapter-%.html: %.adoc asciidoc-pve ${PVE_COMMON_DOC_SOURCES}
+       ./asciidoc-pve compile-chapter -o $@ $*.adoc
 
-%.1.html: %.adoc %.1-synopsis.adoc ${PVE_COMMON_DOC_SOURCES}
-       asciidoc ${ADOC_MAN1_HTML_ARGS} -o $@ $*.adoc
+%.1.html: %.adoc %.1-synopsis.adoc asciidoc-pve ${PVE_COMMON_DOC_SOURCES}
+       ./asciidoc-pve compile-man-html -o $@ $*.adoc
 
-pmxcfs.8.html: pmxcfs.adoc pmxcfs.8-cli.adoc ${PVE_COMMON_DOC_SOURCES}
-       asciidoc ${ADOC_MAN8_HTML_ARGS} -o $@ pmxcfs.adoc
+pmxcfs.8.html: pmxcfs.adoc pmxcfs.8-cli.adoc asciidoc-pve ${PVE_COMMON_DOC_SOURCES}
+       ./asciidoc-pve compile-man-html -o $@ pmxcfs.adoc
 
-%.8.html: %.adoc %.8-synopsis.adoc ${PVE_COMMON_DOC_SOURCES}
-       asciidoc ${ADOC_MAN8_HTML_ARGS} -o $@ $*.adoc
+%.8.html: %.adoc %.8-synopsis.adoc asciidoc-pve ${PVE_COMMON_DOC_SOURCES}
+       ./asciidoc-pve compile-man-html -o $@ $*.adoc
 
-%.5.html: %.adoc %.5-opts.adoc ${PVE_COMMON_DOC_SOURCES}
-       asciidoc ${ADOC_MAN5_HTML_ARGS} -o $@ $*.adoc
+%.5.html: %.adoc %.5-opts.adoc asciidoc-pve ${PVE_COMMON_DOC_SOURCES}
+       ./asciidoc-pve compile-man-html -o $@ $*.adoc
 
-%.5-plain.html: %.adoc %.5-opts.adoc ${PVE_COMMON_DOC_SOURCES}
-       asciidoc -s ${ADOC_MAN5_HTML_ARGS} -o $@ $*.adoc
+%.5-plain.html: %.adoc %.5-opts.adoc asciidoc-pve ${PVE_COMMON_DOC_SOURCES}
+       ./asciidoc-pve compile-man-wiki -o $@ $*.adoc
 
 README.html: README.adoc
        asciidoc ${ADOC_STDARG} -o $@ $<
@@ -282,8 +280,10 @@ ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB}: index.html ${INDEX_INCLUDES} ${WIKI_IMPO
        # install files for pve-doc-generator package
        mkdir -p build/usr/share/${GEN_PACKAGE}
        mkdir -p build/usr/share/doc/${GEN_PACKAGE}
+       mkdir -p build/usr/bin
        install -m 0644 ${GEN_DEB_SOURCES} build/usr/share/${GEN_PACKAGE}
        install -m 0755 ${GEN_SCRIPTS} build/usr/share/${GEN_PACKAGE}
+       install -m 0755 asciidoc-pve build/usr/bin/
        # install files for pvedocs package
        mkdir -p build/usr/share/${DOC_PACKAGE}
        mkdir -p build/usr/share/doc/${DOC_PACKAGE}
@@ -310,5 +310,5 @@ update: clean
        make all
 
 clean: 
-       rm -rf *.tmp.xml *.html *.pdf *.epub *.tmp *.1 *.5 *.8 *.deb *.changes build api-viewer/apidoc.js chapter-*.html *-plain.html chapter-*.html pve-admin-guide.chunked asciidoc-pve link-refs.json .asciidoc-pve-tmp_* pve-docs-mediawiki-import
+       rm -rf *.html *.pdf *.epub *.tmp *.1 *.5 *.8 *.deb *.changes build api-viewer/apidoc.js chapter-*.html *-plain.html chapter-*.html pve-admin-guide.chunked asciidoc-pve link-refs.json .asciidoc-pve-tmp_* pve-docs-mediawiki-import
        find . -name '*~' -exec rm {} ';'