buildsys: consistent makefile variable parenthesis

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index f872c8b493064ba16e227c92a49b57b2613e7c94..3f27cf919d0fc37db59ab267bbf0fb8ddc96fecb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,13 +7,13 @@ BUILDSRC := $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
 DESTDIR=
 PREFIX=/usr
-BINDIR=${PREFIX}/bin
-LIBDIR=${PREFIX}/lib
-SBINDIR=${PREFIX}/sbin
-MANDIR=${PREFIX}/share/man
-DOCDIR=${PREFIX}/share/doc/${PACKAGE}
-MAN1DIR=${MANDIR}/man1/
-PERLDIR=${PREFIX}/share/perl5
+BINDIR=$(PREFIX)/bin
+LIBDIR=$(PREFIX)/lib
+SBINDIR=$(PREFIX)/sbin
+MANDIR=$(PREFIX)/share/man
+DOCDIR=$(PREFIX)/share/doc/$(PACKAGE)
+MAN1DIR=$(MANDIR)/man1/
+PERLDIR=$(PREFIX)/share/perl5
 
 PERL_ARCHLIB := `perl -MConfig -e 'print $$Config{archlib};'`
 PERL_INSTALLVENDORARCH := `perl -MConfig -e 'print $$Config{installvendorarch};'`
@@ -27,8 +27,8 @@ PERLSODIR=$(PERL_INSTALLVENDORARCH)/auto
 
 GITVERSION:=$(shell git rev-parse HEAD)
 
-DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
-DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
+DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
+DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
 
 all:
 
@@ -37,46 +37,44 @@ RADOS.c: RADOS.xs typemap
        mv RADOS.xsc RADOS.c
 
 RADOS.so: RADOS.c
-       gcc ${CFLAGS} -lrados -o RADOS.so RADOS.c
-
+       gcc $(CFLAGS) -lrados -o RADOS.so RADOS.c
 
 .PHONY: dinstall
 dinstall: deb
-       dpkg -i ${DEB}
+       dpkg -i $(DEB)
 
 .PHONY: install
 install: PVE/RADOS.pm RADOS.so
-       install -D -m 0644 PVE/RADOS.pm ${DESTDIR}${PERLDIR}/PVE/RADOS.pm
-       install -D -m 0644 -s RADOS.so ${DESTDIR}${PERLSODIR}/PVE/RADOS/RADOS.so
+       install -D -m 0644 PVE/RADOS.pm $(DESTDIR)$(PERLDIR)/PVE/RADOS.pm
+       install -D -m 0644 -s RADOS.so $(DESTDIR)$(PERLSODIR)/PVE/RADOS/RADOS.so
 
 .PHONY: $(BUILDSRC)
 $(BUILDSRC):
        rm -rf $(BUILDSRC)
        rsync -a * $(BUILDSRC)
        sed -e "s|@PERLAPI@|perlapi-$(PERL_APIVER)|g" debian/control.in >$(BUILDSRC)/debian/control
-       echo "git clone git://git.proxmox.com/git/librados2-perl.git\\ngit checkout ${GITVERSION}" > $(BUILDSRC)/debian/SOURCE
+       echo "git clone git://git.proxmox.com/git/librados2-perl.git\\ngit checkout $(GITVERSION)" > $(BUILDSRC)/debian/SOURCE
 
 .PHONY: deb
-deb: ${DEB}
-${DEB}: $(BUILDSRC)
+deb: $(DEB)
+$(DEB): $(BUILDSRC)
        cd $(BUILDSRC); dpkg-buildpackage -b -us -uc
-       lintian ${DEB}
+       lintian $(DEB)
 
 .PHONY: dsc
-dsc: ${DSC}
-${DSC}: $(BUILDSRC)
+dsc: $(DSC)
+$(DSC): $(BUILDSRC)
        cd $(BUILDSRC); dpkg-buildpackage -S -us -uc -d -nc
-       lintian ${DSC}
+       lintian $(DSC)
 
 .PHONY: clean
-clean:         
+clean:
        rm -rf *~ build *.deb *.changes *.buildinfo *.dsc *.tar.gz
        find . -name '*~' -exec rm {} ';'
 
 .PHONY: distclean
 distclean: clean
 
-
 .PHONY: upload
-upload: ${DEB}
-       tar cf - ${DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist buster --arch ${DEB_BUILD_ARCH}
+upload: $(DEB)
+       tar cf - $(DEB) | ssh repoman@repo.proxmox.com -- upload --product pve --dist buster --arch $(DEB_BUILD_ARCH)