tests: unify config file naming

[pve-access-control.git] / Makefile

diff --git a/Makefile b/Makefile
index e84be2793b0635eb52b123e8f0a251a2c97e2bbf..3ec8890a47ee84660618a132d6536c668705f6fe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
-VERSION=5.1
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
+
 PACKAGE=libpve-access-control
-PKGREL=10
 
-BUILDDIR ?= ${PACKAGE}-${VERSION}
+
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
 
 DESTDIR=
 PREFIX=/usr
@@ -16,13 +18,10 @@ ZSHCOMPLDIR=${PREFIX}/share/zsh/vendor-completions/
 
 export PERLDIR=${PREFIX}/share/perl5
 
-export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
-
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
-DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
-DSC=${PACKAGE}_${VERSION}-${PKGREL}.dsc
+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
 
 # this requires package pve-doc-generator
 export NOVIEW=1
@@ -52,7 +51,6 @@ install: pveum.1 oathkeygen pveum.bash-completion pveum.zsh-completion
        install -d ${DESTDIR}/${MAN1DIR}
        install -d ${DESTDIR}/${DOCDIR}
        install -m 0644 pveum.1 ${DESTDIR}/${MAN1DIR}
-       gzip -9 -n ${DESTDIR}/${MAN1DIR}/pveum.1
        install -m 0644 -D pveum.bash-completion ${DESTDIR}${BASHCOMPLDIR}/pveum
        install -m 0644 -D pveum.zsh-completion ${DESTDIR}${ZSHCOMPLDIR}/_pveum
 
@@ -60,6 +58,7 @@ install: pveum.1 oathkeygen pveum.bash-completion pveum.zsh-completion
 test:
        perl -I. ./pveum verifyapi
        perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->verify_api();"
+       make -C test check
 
 ${BUILDDIR}:
        rm -rf ${BUILDDIR}
@@ -80,7 +79,7 @@ ${DSC}: ${BUILDDIR}
 
 .PHONY: upload
 upload: ${DEB}
-       tar cf - ${DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
+       tar cf - ${DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist buster --arch ${DEB_BUILD_ARCH}
 
 .PHONY: clean
 clean: