From d5a80540120176a8f6de454eb0a7ebce2010d9cf Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 10 Jul 2019 17:24:51 +0200 Subject: [PATCH] buildsys: use dpkg-dev makefile helpers for pkg info Signed-off-by: Thomas Lamprecht --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index bd5fb88..4b564c8 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ -PKGVERSION=0.0.5 -PKGRELEASE=2 +include /usr/share/dpkg/pkg-info.mk +include /usr/share/dpkg/architecture.mk + PACKAGE=omping -PKGDIR=${PACKAGE}-${PKGVERSION} -PKGSRC=${PACKAGE}_${PKGVERSION}.orig.tar.gz +PKGDIR=${PACKAGE}-${DEB_VERSION_UPSTREAM} +PKGSRC=${PACKAGE}_${DEB_VERSION_UPSTREAM}.orig.tar.gz -ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) GITVERSION:=$(shell cat .git/refs/heads/master) -DEBS= ${PACKAGE}_${PKGVERSION}-${PKGRELEASE}_${ARCH}.deb +DEBS= ${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb all: ${DEBS} @@ -21,13 +21,13 @@ ${DEBS}: ${PKGSRC} .PHONY: upload upload: ${DEBS} - tar cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist buster --arch ${ARCH} + tar cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist buster --arch ${DEB_BUILD_ARCH} distclean: clean .PHONY: clean clean: - rm -rf *~ *_${ARCH}.deb *.changes *.dsc ${PKGDIR} + rm -rf *~ *_${DEB_BUILD_ARCH}.deb *.changes *.dsc *.buildinfo ${PKGDIR} .PHONY: dinstall dinstall: ${DEBS} -- 2.39.2