From 142576680ce881b441280d10c38e63dc871a17d4 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 22 May 2019 08:21:57 +0200 Subject: [PATCH] buildsys: use dpkg-dev makefile helpers for pkg info and do some general cleanup while we touch this Signed-off-by: Thomas Lamprecht --- Makefile | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index a555818d..ba608838 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,16 @@ +include /usr/share/dpkg/pkg-info.mk + PACKAGE=libjs-extjs -PKGVER=6.0.1 -PKGREL=2 -BUILD_DIR=${PACKAGE}-${PKGVER} +BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM} +GITVERSION:=$(shell git rev-parse HEAD) -DEB=${PACKAGE}_${PKGVER}-${PKGREL}_all.deb -DSC=${PACKAGE}_${PKGVER}-${PKGREL}.dsc +DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb +DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc all: deb -${BUILD_DIR}: debian extjs +${BUILDDIR}: debian extjs rm -rf $@ $@.tmp mkdir $@.tmp rsync -a debian/ $@.tmp/debian @@ -20,27 +21,25 @@ ${BUILD_DIR}: debian extjs .PHONY: deb deb: ${DEB} -${DEB}: ${BUILD_DIR} - cd ${BUILD_DIR}; dpkg-buildpackage -b -us -uc +${DEB}: ${BUILDDIR} + cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc lintian $@ .PHONY: dsc dsc: ${DSC} -${DSC}: ${BUILD_DIR} - cd ${BUILD_DIR}; tar czf ../${PACKAGE}_${PKGVER}.orig.tar.gz * - cd ${BUILD_DIR}; dpkg-buildpackage -S -us -uc -d +${DSC}: ${BUILDDIR} + cd ${BUILDDIR}; tar czf ../${PACKAGE}_${DEB_VERSION_UPSTREAM}.orig.tar.gz * + cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d lintian $@ .PHONY: upload upload: ${DEB} tar cf - ${DEB} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch -.PHONY: distclean +.PHONY: distclean clean distclean: clean - -.PHONY: clean clean: - rm -rf ${BUILD_DIR} ${BUILD_DIR}.tmp *.deb *.changes *.buildinfo *.orig.tar.* *.dsc *.debian.tar.* + rm -rf ${PACKAGE}-*/ *.deb *.changes *.buildinfo *.orig.tar.* *.dsc *.debian.tar.* find . -name '*~' -exec rm {} ';' .PHONY: dinstall -- 2.39.2