api-viewer: properly HTML encode properties

[pmg-docs.git] / Makefile

diff --git a/Makefile b/Makefile
index 8dbf4cf21f3fefcbb018880a3e16c7cc35ac57d5..8b125df1f87d7c0c8d4395064cd45da5aadf13e5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,11 @@
+include /usr/share/dpkg/pkg-info.mk
+
 DGDIR=.
 ASCIIDOC_PMG=./asciidoc-pmg
 
 GEN_PACKAGE=pmg-doc-generator
 DOC_PACKAGE=pmg-docs
+WEB_PACKAGE=pmg-docs-apache
 
 # also update debian/changelog
 PKGREL=1
@@ -11,9 +14,9 @@ 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
-
+GEN_DEB=${GEN_PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${ARCH}.deb
+DOC_DEB=${DOC_PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+WEB_DEB=${WEB_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 +36,7 @@ ADOC_SOURCES_GUESS=$(filter-out %-synopsis.adoc %-opts.adoc %-table.adoc, $(wild
 
 pmg-doc-generator.mk: .pmg-doc-depends pmg-doc-generator.mk.in
        cat pmg-doc-generator.mk.in .pmg-doc-depends > $@.tmp
+       sed -i "s/@RELEASE@$$/${DEB_VERSION_UPSTREAM}/" $@.tmp
        mv $@.tmp $@
 
 -include ./pmg-doc-generator.mk
@@ -145,7 +149,7 @@ dinstall: ${GEN_DEB} ${DOC_DEB}
 .PHONY: deb
 deb: ${DOC_DEB}
 
-${GEN_DEB}: ${DOC_DEB}
+${WEB_DEB} ${GEN_DEB}: ${DOC_DEB}
 
 ${DOC_DEB}:
        rm -f ${GEN_DEB} ${DOC_DEB}
@@ -153,7 +157,7 @@ ${DOC_DEB}:
        rsync -a * build/
        echo "git clone git://git.proxmox.com/git/pmg-docs.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
        cd build; dpkg-buildpackage -b -us -uc
-       lintian $(DOC_DEB) $(GEN_DEB)
+       lintian $(DOC_DEB) $(GEN_DEB) $(WEB_DEB)
 
 .PHONY: clean-build
 clean-build:
@@ -189,8 +193,8 @@ doc-install: index.html $(API_VIEWER_SOURCES) verify-images
        install -m 0644 ${API_VIEWER_SOURCES} $(DESTDIR)/usr/share/${DOC_PACKAGE}/api-viewer
 
 .PHONY: upload
-upload: ${GEN_DEB} ${DOC_DEB}
-       tar cf - ${GEN_DEB} ${DOC_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pmg --dist stretch
+upload: ${WEB_DEB} ${GEN_DEB} ${DOC_DEB}
+       tar cf - ${WEB_DEB} ${GEN_DEB} ${DOC_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pmg --dist stretch
 
 .PHONY: update
 update: clean