makefile: convert to use simple parenthesis

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

diff --git a/Makefile b/Makefile
index 754ee26b8393ed5ed5bad5ba94fb0a6de02f9e12..52f2062d5178adf8636b55a1e248e9a61b41fef6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,49 +5,48 @@ PACKAGE=pve-ha-manager
 SIMPACKAGE=pve-ha-simulator
 
 GITVERSION:=$(shell git rev-parse HEAD)
-BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
-DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
-DBG_DEB=${PACKAGE}-dbgsym_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
+DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
+DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
 
-DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
-SIMDEB=${SIMPACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
-SIMDSC=${SIMPACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
+DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
+SIMDEB=$(SIMPACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
+SIMDSC=$(SIMPACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
 
 all: deb
 
-${BUILDDIR}:
-       rm -rf ${BUILDDIR}
-       rsync -a src/ debian ${BUILDDIR}
-       echo "git clone git://git.proxmox.com/git/pve-ha-manager.git\\ngit checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE
+$(BUILDDIR):
+       rm -rf $(BUILDDIR)
+       rsync -a src/ debian $(BUILDDIR)
+       echo "git clone git://git.proxmox.com/git/pve-ha-manager.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
 
 .PHONY: dinstall
 dinstall: $(DEB) $(SIMDEB)
-       dpkg -i ${DEB} ${SIMDEB}
+       dpkg -i $(DEB) $(SIMDEB)
 
 .PHONY: deb
-deb: ${DEB} ${SIMDEB}
-${DEB} ${DBG_DEB}: ${BUILDDIR}
-       cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
-       lintian ${DEB}
-       lintian ${SIMDEB}
+deb: $(DEB) $(SIMDEB)
+$(DEB) $(DBG_DEB): $(BUILDDIR)
+       cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
+       lintian $(DEB)
+       lintian $(SIMDEB)
 
 .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: clean
 clean:
        make -C src clean
-       rm -rf ${BUILDDIR} *.tar.gz *.dsc *.deb ${PACKAGE}-*.tar.gz *.changes *.buildinfo
-       find . -name '*~' -exec rm {} ';'
+       rm -rf $(BUILDDIR) *.tar.gz *.dsc *.deb $(PACKAGE)-*.tar.gz *.changes *.buildinfo
 
 .PHONY: distclean
 distclean: clean
 
 .PHONY: upload
-upload: ${DEB} ${SIMDEB}
-       tar cf - ${DEB} ${DBG_DEB} ${SIMDEB}|ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch ${DEB_BUILD_ARCH}
+upload: $(DEB) $(SIMDEB)
+       tar cf - $(DEB) $(DBG_DEB) $(SIMDEB)|ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch $(DEB_BUILD_ARCH)
 

diff --git a/src/Makefile b/src/Makefile
index 2ff12de0d02eec4b8d07978a347550514bbbb814..07f3ebf6461ec4e28068b165238383ea5d56c033 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,16 +2,16 @@ PACKAGE=pve-ha-manager
 SIMPACKAGE=pve-ha-simulator
 
 PREFIX=/usr
-BINDIR=${PREFIX}/bin
-SBINDIR=${PREFIX}/sbin
-MANDIR=${PREFIX}/share/man
-DOCDIR=${PREFIX}/share/doc/${PACKAGE}
-SIMDOCDIR=${PREFIX}/share/doc/${SIMPACKAGE}
-MAN1DIR=${MANDIR}/man1/
-MAN8DIR=${MANDIR}/man8/
-BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/
-ZSHCOMPLDIR=${PREFIX}/share/zsh/vendor-completions/
-export PERLDIR=${PREFIX}/share/perl5
+BINDIR=$(PREFIX)/bin
+SBINDIR=$(PREFIX)/sbin
+MANDIR=$(PREFIX)/share/man
+DOCDIR=$(PREFIX)/share/doc/$(PACKAGE)
+SIMDOCDIR=$(PREFIX)/share/doc/$(SIMPACKAGE)
+MAN1DIR=$(MANDIR)/man1/
+MAN8DIR=$(MANDIR)/man8/
+BASHCOMPLDIR=$(PREFIX)/share/bash-completion/completions/
+ZSHCOMPLDIR=$(PREFIX)/share/zsh/vendor-completions/
+export PERLDIR=$(PREFIX)/share/perl5
 
 # this requires package pve-doc-generator
 export NOVIEW=1
@@ -52,29 +52,29 @@ install: watchdog-mux pve-ha-crm pve-ha-lrm ha-manager.1 pve-ha-crm.8 pve-ha-lrm
        PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::Service::pve_ha_crm; PVE::Service::pve_ha_crm->verify_api();"
        PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::Service::pve_ha_lrm; PVE::Service::pve_ha_lrm->verify_api();"
        PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::ha_manager; PVE::CLI::ha_manager->verify_api();"
-       install -d ${DESTDIR}${SBINDIR}
-       install -m 0755 pve-ha-crm ${DESTDIR}${SBINDIR}
-       install -m 0755 pve-ha-lrm ${DESTDIR}${SBINDIR}
-       install -m 0755 ha-manager ${DESTDIR}${SBINDIR}
-       install -m 0755 watchdog-mux ${DESTDIR}${SBINDIR}
-       install -d ${DESTDIR}${BINDIR}
-       install -m 0755 pve-ha-simulator ${DESTDIR}${BINDIR}
-       install -m 0644 -D pve-ha-crm.bash-completion ${DESTDIR}${BASHCOMPLDIR}/pve-ha-crm
-       install -m 0644 -D pve-ha-lrm.bash-completion ${DESTDIR}${BASHCOMPLDIR}/pve-ha-lrm
-       install -m 0644 -D ha-manager.bash-completion ${DESTDIR}${BASHCOMPLDIR}/ha-manager
-       install -m 0644 -D pve-ha-crm.zsh-completion ${DESTDIR}${ZSHCOMPLDIR}/_pve-ha-crm
-       install -m 0644 -D pve-ha-lrm.zsh-completion ${DESTDIR}${ZSHCOMPLDIR}/_pve-ha-lrm
-       install -m 0644 -D ha-manager.zsh-completion ${DESTDIR}${ZSHCOMPLDIR}/_ha-manager
+       install -d $(DESTDIR)$(SBINDIR)
+       install -m 0755 pve-ha-crm $(DESTDIR)$(SBINDIR)
+       install -m 0755 pve-ha-lrm $(DESTDIR)$(SBINDIR)
+       install -m 0755 ha-manager $(DESTDIR)$(SBINDIR)
+       install -m 0755 watchdog-mux $(DESTDIR)$(SBINDIR)
+       install -d $(DESTDIR)$(BINDIR)
+       install -m 0755 pve-ha-simulator $(DESTDIR)$(BINDIR)
+       install -m 0644 -D pve-ha-crm.bash-completion $(DESTDIR)$(BASHCOMPLDIR)/pve-ha-crm
+       install -m 0644 -D pve-ha-lrm.bash-completion $(DESTDIR)$(BASHCOMPLDIR)/pve-ha-lrm
+       install -m 0644 -D ha-manager.bash-completion $(DESTDIR)$(BASHCOMPLDIR)/ha-manager
+       install -m 0644 -D pve-ha-crm.zsh-completion $(DESTDIR)$(ZSHCOMPLDIR)/_pve-ha-crm
+       install -m 0644 -D pve-ha-lrm.zsh-completion $(DESTDIR)$(ZSHCOMPLDIR)/_pve-ha-lrm
+       install -m 0644 -D ha-manager.zsh-completion $(DESTDIR)$(ZSHCOMPLDIR)/_ha-manager
        make -C PVE install
-       make -C PVE PERLDIR=${PREFIX}/share/${SIMPACKAGE} installsim
-       install -d ${DESTDIR}/${MAN8DIR}
-       install -m 0644 pve-ha-crm.8 ${DESTDIR}/${MAN8DIR}
-       gzip -9 ${DESTDIR}/${MAN8DIR}/pve-ha-crm.8
-       install -m 0644 pve-ha-lrm.8 ${DESTDIR}/${MAN8DIR}
-       gzip -9 ${DESTDIR}/${MAN8DIR}/pve-ha-lrm.8
-       install -d ${DESTDIR}/${MAN1DIR}
-       install -m 0644 ha-manager.1 ${DESTDIR}/${MAN1DIR}
-       gzip -9 ${DESTDIR}/${MAN1DIR}/ha-manager.1
+       make -C PVE PERLDIR=$(PREFIX)/share/$(SIMPACKAGE) installsim
+       install -d $(DESTDIR)/$(MAN8DIR)
+       install -m 0644 pve-ha-crm.8 $(DESTDIR)/$(MAN8DIR)
+       gzip -9 $(DESTDIR)/$(MAN8DIR)/pve-ha-crm.8
+       install -m 0644 pve-ha-lrm.8 $(DESTDIR)/$(MAN8DIR)
+       gzip -9 $(DESTDIR)/$(MAN8DIR)/pve-ha-lrm.8
+       install -d $(DESTDIR)/$(MAN1DIR)
+       install -m 0644 ha-manager.1 $(DESTDIR)/$(MAN1DIR)
+       gzip -9 $(DESTDIR)/$(MAN1DIR)/ha-manager.1
 
 .PHONY: test
 test: