From 1f9e7476e073ffa75aa012ceaef0e312b0e2c305 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 23 May 2019 17:50:04 +0200 Subject: [PATCH] buildsys: use dpkg-dev makefile helpers for pkg info Signed-off-by: Thomas Lamprecht --- Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 723f566..6b66230 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -VERSION=3.0 +include /usr/share/dpkg/pkg-info.mk + PACKAGE=dab -PKGREL=12 -BUILDDIR ?= ${PACKAGE}-${VERSION} +BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM} SCRIPTS= \ scripts/init.pl \ @@ -13,8 +13,8 @@ SCRIPTS= \ GITVERSION:=$(shell git rev-parse HEAD) -DEB=${PACKAGE}_${VERSION}-${PKGREL}_all.deb -DSC=${PACKAGE}_${VERSION}-${PKGREL}.dsc +DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb +DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc DESTDIR= PREFIX=/usr @@ -75,7 +75,7 @@ dab.1.pod: dab dab.1: dab.1.pod rm -f $@ - pod2man -n $< -s 1 -r ${VERSION} <$< >$@.tmp + pod2man -n $< -s 1 -r ${DEB_VERSION_UPSTREAM} <$< >$@.tmp mv $@.tmp $@ @@ -89,5 +89,3 @@ distclean: clean .PHONY: upload upload: ${DEB} tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist stretch - - -- 2.39.2