diff --git a/Makefile b/Makefile index 33c833a..000d6d8 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ ASCIIDOC_PMG=./asciidoc-pmg GEN_PACKAGE=pmg-doc-generator DOC_PACKAGE=pmg-docs +WEB_PACKAGE=pmg-docs-apache # also update debian/changelog PKGREL=2 @@ -13,7 +14,7 @@ ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) GEN_DEB=${GEN_PACKAGE}_${DOCRELEASE}-${PKGREL}_${ARCH}.deb DOC_DEB=${DOC_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb - +WEB_DEB=${WEB_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp) SOURCE_DATE_HUMAN := $(shell date -d "@${SOURCE_DATE_EPOCH}") @@ -145,7 +146,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 +154,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 +190,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