From f5e87de606defc14bd2a73f5d6af3f071928e57b Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 24 May 2023 13:56:17 +0200 Subject: [PATCH] makefile: convert to use simple parenthesis Signed-off-by: Thomas Lamprecht --- Makefile | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 26120a2..04be695 100644 --- a/Makefile +++ b/Makefile @@ -4,19 +4,19 @@ PACKAGE=libpve-storage-perl DESTDIR= PREFIX=/usr -BINDIR=${PREFIX}/bin -SBINDIR=${PREFIX}/sbin -MANDIR=${PREFIX}/share/man -DOCDIR=${PREFIX}/share/doc/${PACKAGE} -MAN1DIR=${MANDIR}/man1/ -BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/ -ZSHCOMPLDIR=${PREFIX}/share/zsh/vendor-completions/ +BINDIR=$(PREFIX)/bin +SBINDIR=$(PREFIX)/sbin +MANDIR=$(PREFIX)/share/man +DOCDIR=$(PREFIX)/share/doc/$(PACKAGE) +MAN1DIR=$(MANDIR)/man1/ +BASHCOMPLDIR=$(PREFIX)/share/bash-completion/completions/ +ZSHCOMPLDIR=$(PREFIX)/share/zsh/vendor-completions/ -export PERLDIR=${PREFIX}/share/perl5 +export PERLDIR=$(PREFIX)/share/perl5 GITVERSION:=$(shell git rev-parse HEAD) -DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb +DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb -include /usr/share/pve-doc-generator/pve-doc-generator.mk @@ -24,7 +24,7 @@ all: .PHONY: dinstall dinstall: deb - dpkg -i ${DEB} + dpkg -i $(DEB) pvesm.bash-completion: perl -I. -T -e "use PVE::CLI::pvesm; PVE::CLI::pvesm->generate_bash_completions();" >$@.tmp @@ -36,24 +36,24 @@ pvesm.zsh-completion: .PHONY: install install: PVE pvesm.1 pvesm.bash-completion pvesm.zsh-completion - install -d ${DESTDIR}${SBINDIR} - install -m 0755 pvesm ${DESTDIR}${SBINDIR} + install -d $(DESTDIR)$(SBINDIR) + install -m 0755 pvesm $(DESTDIR)$(SBINDIR) make -C PVE install make -C udev-rbd install - install -d ${DESTDIR}/usr/share/man/man1 - install -m 0644 pvesm.1 ${DESTDIR}/usr/share/man/man1/ - gzip -9 -n ${DESTDIR}/usr/share/man/man1/pvesm.1 - install -m 0644 -D pvesm.bash-completion ${DESTDIR}${BASHCOMPLDIR}/pvesm - install -m 0644 -D pvesm.zsh-completion ${DESTDIR}${ZSHCOMPLDIR}/_pvesm + install -d $(DESTDIR)/usr/share/man/man1 + install -m 0644 pvesm.1 $(DESTDIR)/usr/share/man/man1/ + gzip -9 -n $(DESTDIR)/usr/share/man/man1/pvesm.1 + install -m 0644 -D pvesm.bash-completion $(DESTDIR)$(BASHCOMPLDIR)/pvesm + install -m 0644 -D pvesm.zsh-completion $(DESTDIR)$(ZSHCOMPLDIR)/_pvesm .PHONY: deb -deb: ${DEB} -${DEB}: +deb: $(DEB) +$(DEB): rm -rf build rsync -a * build - echo "git clone git://git.proxmox.com/git/pve-storage.git\\ngit checkout ${GITVERSION}" >build/debian/SOURCE + echo "git clone git://git.proxmox.com/git/pve-storage.git\\ngit checkout $(GITVERSION)" >build/debian/SOURCE cd build; dpkg-buildpackage -b -us -uc - lintian ${DEB} + lintian $(DEB) .PHONY: test test: @@ -62,7 +62,7 @@ test: .PHONY: clean clean: - rm -f *.xml.tmp *.1 *.5 *.8 *{synopsis,opts}.adoc docinfo.xml + rm -f *.xml.tmp *.1 *.5 *.8 *(synopsis,opts).adoc docinfo.xml rm -rf build *.deb *.buildinfo *.changes .PHONY: distclean @@ -70,5 +70,5 @@ distclean: clean .PHONY: upload -upload: ${DEB} - tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist bullseye +upload: $(DEB) + tar cf - $(DEB) | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist bullseye