X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=Makefile;h=54d3dccf4c108ca8433e9088b60151a0f2d7476c;hp=63272056c2b13940eeee0b1434b933858400e0f1;hb=df41beeca0919ea3e83b93b3e194d7702ca8ed57;hpb=2296c4908165344045c91b2af975ca6a999e31ea

diff --git a/Makefile b/Makefile
index 6327205..54d3dcc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-
+RELEASE=4.1
 
 PVESM_SOURCES=attributes.txt pvesm.adoc pvesm.1-synopsis.adoc $(shell ls pve-storage-*.adoc)
 PVEUM_SOURCES=attributes.txt pveum.adoc pveum.1-synopsis.adoc
@@ -7,8 +7,15 @@ 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
 
+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 			\
@@ -22,11 +29,14 @@ PVE_ADMIN_GUIDE_SOURCES=		\
 	images/cluster-nwdiag.svg	\
 	images/node-nwdiag.svg		\
 	pve-bibliography.adoc		\
+	GFDL.adoc			\
 	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 $@;
@@ -36,12 +46,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:
@@ -49,12 +59,12 @@ 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
@@ -62,20 +72,21 @@ 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 &
+	asciidoc -a "date=$(shell date)" -a "revnumber=${RELEASE}" index.adoc 
+	$(BROWSER) index.html &
 
 pve-admin-guide.html: ${PVE_ADMIN_GUIDE_SOURCES}
-	asciidoc -a "date=$(shell date)" pve-admin-guide.adoc 
-	test -z "$${NOVIEW}" && iceweasel $@ &
+	asciidoc -a "revnumber=${RELEASE}" -a "date=$(shell date)" pve-admin-guide.adoc 
+	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 $@ &
+	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: