X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=Makefile;h=d0474aad239e037adf16de6c10a75c1d5969f95c;hp=0826c28dedd4347351f31cb2e1c7a089b45ef3e0;hb=8faad89e8601e188e551af852e679c6d9b61990d;hpb=1ed794c87109d78e69b9b313af8ca47523a4926a

diff --git a/Makefile b/Makefile
index 0826c28..d0474aa 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ DOC_PACKAGE=pve-docs
 MEDIAWIKI_PACKAGE=pve-docs-mediawiki
 
 # also update debian/changelog
-PKGREL=8
+PKGREL=10
 
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
@@ -19,7 +19,9 @@ MEDIAWIKI_DEB=${MEDIAWIKI_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
 all: index.html
 
 .pve-doc-depends link-refs.json: $(wildcard *.adoc) scan-adoc-refs
-	./scan-adoc-refs *.adoc --depends .pve-doc-depends > link-refs.json
+	./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
 
 pve-doc-generator.mk: .pve-doc-depends pve-doc-generator.mk.in
 	cat pve-doc-generator.mk.in .pve-doc-depends > $@.tmp
@@ -30,8 +32,7 @@ include ./pve-doc-generator.mk
 GEN_DEB_SOURCES=				\
 	pve-doc-generator.mk			\
 	${MANUAL_SOURCES}			\
-	${PVESM_ADOCSOURCES}			\
-	pmxcfs.8-cli.adoc			\
+	pmxcfs.8-synopsis.adoc			\
 	docinfo.xml
 
 GEN_SCRIPTS=					\
@@ -67,7 +68,7 @@ INDEX_INCLUDES=								\
 	pve-admin-guide.epub 						\
 	$(sort $(addsuffix .html, ${MANUAL_PAGES}) ${CHAPTER_LIST})
 
-ADOC_STDARG= -a icons -a data-uri -a "date=$(shell date)" -a "revnumber=${DOCRELEASE}"
+ADOC_STDARG= -b html5 -a icons -a data-uri -a "date=$(shell date)" -a "revnumber=${DOCRELEASE}"
 
 BROWSER?=xdg-open
 
@@ -75,27 +76,6 @@ BROWSER?=xdg-open
 %-nwdiag.svg: %.nwdiag
 	nwdiag -T svg $*.nwdiag -o $@;
 
-%-plain.html: asciidoc-pve %.adoc
-	./asciidoc-pve compile-wiki -o $@ $*.adoc
-
-chapter-%.html: %.adoc asciidoc-pve ${PVE_COMMON_DOC_SOURCES}
-	./asciidoc-pve compile-chapter -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 asciidoc-pve ${PVE_COMMON_DOC_SOURCES}
-	./asciidoc-pve compile-man-html -o $@ pmxcfs.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 asciidoc-pve ${PVE_COMMON_DOC_SOURCES}
-	./asciidoc-pve compile-man-html -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 $@ $<
 
@@ -104,10 +84,10 @@ index: index.html
 	$(BROWSER) index.html &
 
 index.html: index.adoc ${API_VIEWER_SOURCES} ${INDEX_INCLUDES} 
-	asciidoc -a "date=$(shell date)" -a "revnumber=${DOCRELEASE}" index.adoc
+	asciidoc ${ADOC_STDARG} -o $@ index.adoc
 
 pve-admin-guide.html: ${PVE_ADMIN_GUIDE_ADOCDEPENDS}
-	asciidoc -a pvelogo -a "revnumber=${DOCRELEASE}" -a "date=$(shell date)" pve-admin-guide.adoc
+	asciidoc -a pvelogo ${ADOC_STDARG} pve-admin-guide.adoc
 
 pve-admin-guide.chunked: ${PVE_ADMIN_GUIDE_ADOCDEPENDS}
 	rm -rf pve-admin-guide.chunked
@@ -171,7 +151,7 @@ upload: ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB}
 
 .PHONY: update
 update: clean
-	rm -f *.5-opts.adoc *.1-synopsis.adoc *.8-synopsis.adoc
+	find . -regex '.*-\(opts\|synopsis\)\.adoc' -not -name pmxcfs.8-synopsis.adoc -exec rm -f \{\} \;
 	rm -f api-viewer/apidata.js
 	rm -f pve-firewall-macros.adoc pct-network-opts.adoc pct-mountpoint-opts.adoc
 	make all