X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=98b6b44dc213ce7bd643714a2d37a12d4e24e47f;hb=921926036a9bb3824833ca705e68a45a66f38f09;hp=618ca48c81725e661e2efe69d42ffdeb0df98c93;hpb=fcd0059e961d5048007e2efef07dbee52d1d3419;p=pve-docs.git

diff --git a/Makefile b/Makefile
index 618ca48..98b6b44 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+include /usr/share/dpkg/pkg-info.mk
+
+# overwriting below ensures that we can build without full PVE installed
 DGDIR=.
 ASCIIDOC_PVE=./asciidoc-pve
 
@@ -5,16 +8,13 @@ GEN_PACKAGE=pve-doc-generator
 DOC_PACKAGE=pve-docs
 MEDIAWIKI_PACKAGE=pve-docs-mediawiki
 
-# also update debian/changelog
-PKGREL=2
-
 GITVERSION:=$(shell git rev-parse HEAD)
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-GEN_DEB=${GEN_PACKAGE}_${DOCRELEASE}-${PKGREL}_${ARCH}.deb
-DOC_DEB=${DOC_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
-MEDIAWIKI_DEB=${MEDIAWIKI_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
+GEN_DEB=${GEN_PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${ARCH}.deb
+DOC_DEB=${DOC_PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+MEDIAWIKI_DEB=${MEDIAWIKI_PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
 
 export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
 SOURCE_DATE_HUMAN := $(shell date -d "@${SOURCE_DATE_EPOCH}")
@@ -33,6 +33,7 @@ ADOC_SOURCES_GUESS=$(filter-out %-synopsis.adoc %-opts.adoc %-table.adoc, $(wild
 
 pve-doc-generator.mk: .pve-doc-depends pve-doc-generator.mk.in
 	cat pve-doc-generator.mk.in .pve-doc-depends > $@.tmp
+	sed -i "s/@RELEASE@$$/${DEB_VERSION_UPSTREAM}/" $@.tmp
 	mv $@.tmp $@
 
 -include ./pve-doc-generator.mk
@@ -52,6 +53,7 @@ GEN_SCRIPTS=					\
 	gen-pct-network-opts.pl			\
 	gen-pct-mountpoint-opts.pl		\
 	gen-qm.conf.5-opts.pl			\
+	gen-cpu-models.conf.5-opts.pl 		\
 	gen-qm-cloud-init-opts.pl		\
 	gen-vzdump.conf.5-opts.pl		\
 	gen-pve-firewall-cluster-opts.pl	\
@@ -94,7 +96,7 @@ README.html: README.adoc
 
 .PHONY: index
 index: index.html
-	$(BROWSER) index.html &
+	test -z "$${PVE_DOC_INSTANTVIEW}" || $(BROWSER) index.html &
 
 chapter-index-table.adoc: asciidoc-pve
 	./asciidoc-pve chapter-table >$@.tmp
@@ -152,7 +154,7 @@ api-viewer/apidoc.js: api-viewer/apidata.js api-viewer/PVEAPI.js
 
 .PHONY: dinstall
 dinstall: ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB}
-	dpkg -i ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB}
+	dpkg -i ${GEN_DEB} ${DOC_DEB} # ${MEDIAWIKI_DEB}
 
 .PHONY: deb
 deb: $(DOC_DEB)
@@ -217,7 +219,7 @@ mediawiki-install: pve-docs-mediawiki-import
 
 .PHONY: upload
 upload: ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB}
-	tar cf - ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist stretch
+	tar cf - ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist buster
 
 .PHONY: update
 update: