From a3744c5e8f86e1e378bfa8a981e329bfdb87ec4b Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sun, 21 May 2023 10:52:58 +0200 Subject: [PATCH] makefile: convert to use simple parenthesis Signed-off-by: Thomas Lamprecht --- Makefile | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 77ae3f1..894ec88 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ include /usr/share/dpkg/architecture.mk PACKAGE=libpve-access-control -DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb -DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc +DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb +DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc -BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM} +BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM) GITVERSION:=$(shell git rev-parse HEAD) @@ -14,34 +14,33 @@ all: .PHONY: dinstall dinstall: deb - dpkg -i ${DEB} + dpkg -i $(DEB) -${BUILDDIR}: - rm -rf ${BUILDDIR} - cp -a src ${BUILDDIR} - cp -a debian ${BUILDDIR}/ - echo "git clone git://git.proxmox.com/git/pve-access-control.git\\ngit checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE +$(BUILDDIR): + rm -rf $(BUILDDIR) + cp -a src $(BUILDDIR) + cp -a debian $(BUILDDIR)/ + echo "git clone git://git.proxmox.com/git/pve-access-control.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE .PHONY: deb -deb: ${DEB} -${DEB}: ${BUILDDIR} - cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc - lintian ${DEB} +deb: $(DEB) +$(DEB): $(BUILDDIR) + cd $(BUILDDIR); dpkg-buildpackage -b -us -uc + lintian $(DEB) .PHONY: dsc -dsc: ${DSC} -${DSC}: ${BUILDDIR} - cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d - lintian ${DSC} +dsc: $(DSC) +$(DSC): $(BUILDDIR) + cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d + lintian $(DSC) .PHONY: upload -upload: ${DEB} - tar cf - ${DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch ${DEB_BUILD_ARCH} +upload: $(DEB) + tar cf - $(DEB) | ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch $(DEB_BUILD_ARCH) .PHONY: clean clean: - rm -rf ${PACKAGE}-*/ *.deb *.buildinfo *.changes ${PACKAGE}*.tar.gz *.dsc - find . -name '*~' -exec rm {} ';' + rm -rf $(PACKAGE)-*/ *.deb *.buildinfo *.changes $(PACKAGE)*.tar.gz *.dsc .PHONY: distclean distclean: clean -- 2.39.2