X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=Makefile;h=30eb5db034241f6b43b652a6ac513622f373e185;hp=00e6578f43ffad7680585875927478d3011c6721;hb=fc1090efc7ef769163471fcb0d8d9a8a855415af;hpb=8f13ba5f18c2ed2219344af34f6b21653bcd0677

diff --git a/Makefile b/Makefile
index 00e6578..30eb5db 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,17 @@ VZDUMP_SOURCES=attributes.txt vzdump.adoc vzdump.1-synopsis.adoc
 PVEFW_SOURCES=attributes.txt pve-firewall.adoc pve-firewall.8-synopsis.adoc
 QM_SOURCES=attributes.txt qm.adoc qm.1-synopsis.adoc
 PCT_SOURCES=attributes.txt pct.adoc pct.1-synopsis.adoc
+HA_SOURCES=attributes.txt ha-manager.1-synopsis.adoc ha-manager.adoc
+
+SYSADMIN_SOURCES=			\
+	getting-help.adoc		\
+	pve-package-repos.adoc		\
+	pve-installation.adoc		\
+	system-software-updates.adoc	\
+	sysadmin.adoc
 
 PVE_ADMIN_GUIDE_SOURCES=		\
-	sysadmin.adoc			\
+	${SYSADMIN_SOURCES}		\
 	pve-admin-guide.adoc		\
 	pve-intro.adoc			\
 	pmxcfs.adoc 			\
@@ -19,6 +27,7 @@ PVE_ADMIN_GUIDE_SOURCES=		\
 	${PVEUM_SOURCES}		\
 	${PVESM_SOURCES}		\
 	${VZDUMP_SOURCES}		\
+	${HA_SOURCES}			\
 	images/cluster-nwdiag.svg	\
 	images/node-nwdiag.svg		\
 	pve-bibliography.adoc		\
@@ -26,8 +35,10 @@ PVE_ADMIN_GUIDE_SOURCES=		\
 	attributes.txt
 
 ADOC_STDARG= -a icons -a data-uri -a "date=$(shell date)"
-ADOC_MAN1_HTML_ARGS=-a "manvolnum=1" ${ADOC_STDARG}
-ADOC_MAN8_HTML_ARGS=-a "manvolnum=8" ${ADOC_STDARG}
+ADOC_MAN1_HTML_ARGS=-a "manvolnum=1" ${ADOC_STDARG} -a "revnumber=${RELEASE}"
+ADOC_MAN8_HTML_ARGS=-a "manvolnum=8" ${ADOC_STDARG} -a "revnumber=${RELEASE}"
+
+BROWSER?=xdg-open
 
 %-nwdiag.svg: %.nwdiag
 	nwdiag -T svg $*.nwdiag -o $@;
@@ -37,12 +48,12 @@ ADOC_MAN8_HTML_ARGS=-a "manvolnum=8" ${ADOC_STDARG}
 	mv $@.tmp $@
 
 %.1: %.adoc %.1-synopsis.adoc docinfo.xml
-	a2x -a docinfo1 -a "manvolnum=1" -f manpage $*.adoc
+	a2x -a docinfo1 -a "manvolnum=1" -a "manversion=Release ${RELEASE}" -f manpage $*.adoc
 	test -z "$${NOVIEW}" && man -l $@ 
 
 %.1.html: %.adoc %.1-synopsis.adoc docinfo.xml
 	asciidoc ${ADOC_MAN1_HTML_ARGS} -o $@ $*.adoc
-	test -z "$${NOVIEW}" && iceweasel $@ &
+	test -z "$${NOVIEW}" && $(BROWSER) $@ &
 
 
 %.8-synopsis.adoc:
@@ -50,34 +61,34 @@ ADOC_MAN8_HTML_ARGS=-a "manvolnum=8" ${ADOC_STDARG}
 	mv $@.tmp $@
 
 %.8: %.adoc %.8-synopsis.adoc docinfo.xml
-	a2x -a docinfo1 -a "manvolnum=1" -f manpage $*.adoc
+	a2x -a docinfo1 -a "manvolnum=8" -a "manversion=Release ${RELEASE}" -f manpage $*.adoc
 	test -z "$${NOVIEW}" && man -l $@ 
 
 %.8.html: %.adoc %.8-synopsis.adoc docinfo.xml
 	asciidoc ${ADOC_MAN8_HTML_ARGS} -o $@ $*.adoc
-	test -z "$${NOVIEW}" && iceweasel $@ &
+	test -z "$${NOVIEW}" && $(BROWSER) $@ &
 
 
 all: pve-admin-guide.html
 
 index.html: index.adoc ${PVE_ADMIN_GUIDE_SOURCES}
 	$(MAKE) NOVIEW=1 pve-admin-guide.pdf pve-admin-guide.html pve-admin-guide.epub
-	$(MAKE) NOVIEW=1 qm.1.html pct.1.html pvesm.1.html pveum.1.html vzdump.1.html pve-firewall.8.html
-	asciidoc -a "date=$(shell date)" index.adoc 
-	iceweasel index.html &
+	$(MAKE) NOVIEW=1 qm.1.html pct.1.html pvesm.1.html pveum.1.html vzdump.1.html pve-firewall.8.html ha-manager.1.html
+	asciidoc -a "date=$(shell date)" -a "revnumber=${RELEASE}" index.adoc 
+	$(BROWSER) index.html &
 
 pve-admin-guide.html: ${PVE_ADMIN_GUIDE_SOURCES}
 	asciidoc -a "revnumber=${RELEASE}" -a "date=$(shell date)" pve-admin-guide.adoc 
-	test -z "$${NOVIEW}" && iceweasel $@ &
+	test -z "$${NOVIEW}" && $(BROWSER) $@ &
 
 pve-admin-guide.pdf: ${PVE_ADMIN_GUIDE_SOURCES} docinfo.xml pve-admin-guide-docinfo.xml
 	grep ">Release ${RELEASE}<" 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" pve-admin-guide.adoc
-	test -z "$${NOVIEW}" && iceweasel $@ &
+	a2x -a docinfo -a docinfo1 -f pdf -L --dblatex-opts "-P latex.output.revhistory=0" --dblatex-opts "-P latex.class.options=12pt" pve-admin-guide.adoc
+	test -z "$${NOVIEW}" && $(BROWSER) $@ &
 
 pve-admin-guide.epub: ${PVE_ADMIN_GUIDE_SOURCES}
 	a2x -f epub pve-admin-guide.adoc
-	test -z "$${NOVIEW}" && iceweasel $@ &
+	test -z "$${NOVIEW}" && $(BROWSER) $@ &
 
 
 clean: