makefile: convert to use simple parenthesis

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

diff --git a/Makefile b/Makefile
index 1d6189b13aae7df052fefbeb23d4d5d61f2141ce..0cc56ad83d8fb55da88a691aebfec3aab90f72d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ include /usr/share/dpkg/pkg-info.mk
 include /usr/share/dpkg/architecture.mk
 include defines.mk
 
-export PVERELEASE=${DEB_VERSION_UPSTREAM}
-export VERSION=${DEB_VERSION_UPSTREAM_REVISION}
+export PVERELEASE=$(DEB_VERSION_UPSTREAM)
+export VERSION=$(DEB_VERSION_UPSTREAM_REVISION)
 
 DESTDIR=
 
@@ -14,20 +14,20 @@ GITVERSION:=$(shell git rev-parse HEAD)
 # possibly set via debian/rules(.env)
 REPOID?=$(shell git rev-parse --short=8 HEAD)
 
-DEB=${PACKAGE}_${VERSION}_${DEB_BUILD_ARCH}.deb
+DEB=$(PACKAGE)_$(VERSION)_$(DEB_BUILD_ARCH).deb
 
-all: ${SUBDIRS}
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
+all: $(SUBDIRS)
+       set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i; done
 
 .PHONY: check
 check: bin test www
-       ${MAKE} -C bin check
-       ${MAKE} -C test check
-       ${MAKE} -C www check
+       $(MAKE) -C bin check
+       $(MAKE) -C test check
+       $(MAKE) -C www check
 
 .PHONY: dinstall
-dinstall: ${DEB}
-       dpkg -i ${DEB}
+dinstall: $(DEB)
+       dpkg -i $(DEB)
 
 .PHONY: deb
 deb: $(DEB)
@@ -35,34 +35,33 @@ $(DEB):
        rm -rf dest
        mkdir dest
        rsync -a * dest
-       echo "git clone git://git.proxmox.com/git/pve-manager.git\\ngit checkout ${GITVERSION}" >  dest/debian/SOURCE
-       echo "REPOID_GENERATED=${REPOID}" > dest/debian/rules.env
+       echo "git clone git://git.proxmox.com/git/pve-manager.git\\ngit checkout $(GITVERSION)" >  dest/debian/SOURCE
+       echo "REPOID_GENERATED=$(REPOID)" > dest/debian/rules.env
        cd dest; dpkg-buildpackage -b -us -uc
-       lintian ${DEB}
+       lintian $(DEB)
 
 .PHONY: upload
-upload: ${DEB} check
+upload: $(DEB) check
        # check if working directory is clean
        git diff --exit-code --stat && git diff --exit-code --stat --staged
-       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com upload --product pve --dist bullseye
+       tar cf - $(DEB) | ssh -X repoman@repo.proxmox.com upload --product pve --dist bullseye
 
 .PHONY: install
 install: vzdump-hook-script.pl
-       install -d -m 0700 -o www-data -g www-data ${DESTDIR}/var/log/pveproxy
-       install -d ${DOCDIR}/examples
-       install -d ${DESTDIR}/var/lib/${PACKAGE}
-       install -d ${DESTDIR}/var/lib/vz/images
-       install -d ${DESTDIR}/var/lib/vz/template/cache
-       install -d ${DESTDIR}/var/lib/vz/template/iso
-       install -m 0644 vzdump-hook-script.pl ${DOCDIR}/examples/vzdump-hook-script.pl
-       install -m 0644 spice-example-sh ${DOCDIR}/examples/spice-example-sh
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+       install -d -m 0700 -o www-data -g www-data $(DESTDIR)/var/log/pveproxy
+       install -d $(DOCDIR)/examples
+       install -d $(DESTDIR)/var/lib/$(PACKAGE)
+       install -d $(DESTDIR)/var/lib/vz/images
+       install -d $(DESTDIR)/var/lib/vz/template/cache
+       install -d $(DESTDIR)/var/lib/vz/template/iso
+       install -m 0644 vzdump-hook-script.pl $(DOCDIR)/examples/vzdump-hook-script.pl
+       install -m 0644 spice-example-sh $(DOCDIR)/examples/spice-example-sh
+       set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 
 .PHONY: distclean
 distclean: clean
 
 .PHONY: clean
 clean:
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
-       find . -name '*~' -exec rm {} ';'
+       set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
        rm -rf dest country.dat *.deb *.buildinfo *.changes ca-tmp

diff --git a/PVE/API2/Ceph/Makefile b/PVE/API2/Ceph/Makefile
index 5c546bf0a00abbb767e08bea1ef90bfbe1cc6e1e..f33f3735b73ea81d57d4b4224d8976062660e984 100644 (file)
--- a/PVE/API2/Ceph/Makefile
+++ b/PVE/API2/Ceph/Makefile
@@ -17,6 +17,6 @@ clean:
        rm -rf *~
 
 .PHONY: install
-install: ${PERLSOURCE}
-       install -d ${PERLLIBDIR}/PVE/API2/Ceph
-       install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/API2/Ceph
+install: $(PERLSOURCE)
+       install -d $(PERLLIBDIR)/PVE/API2/Ceph
+       install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/API2/Ceph

diff --git a/PVE/API2/Cluster/Makefile b/PVE/API2/Cluster/Makefile
index 8d306507882a12048c9a5c5a3484a08b1495667d..5c92e4f62115b7e69650abc5a2287bc15ea75de2 100644 (file)
--- a/PVE/API2/Cluster/Makefile
+++ b/PVE/API2/Cluster/Makefile
@@ -15,6 +15,6 @@ clean:
        rm -rf *~
 
 .PHONY: install
-install: ${PERLSOURCE}
-       install -d ${PERLLIBDIR}/PVE/API2/Cluster
-       install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/API2/Cluster
+install: $(PERLSOURCE)
+       install -d $(PERLLIBDIR)/PVE/API2/Cluster
+       install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/API2/Cluster

diff --git a/PVE/API2/Hardware/Makefile b/PVE/API2/Hardware/Makefile
index d27d22014fe37b44693799d932d2c1db7cc32930..026a8dd65d6f7d91751d1557fc471ad14268b08a 100644 (file)
--- a/PVE/API2/Hardware/Makefile
+++ b/PVE/API2/Hardware/Makefile
@@ -12,5 +12,5 @@ clean:
 
 .PHONY: install
 install:
-       install -d ${PERLLIBDIR}/PVE/API2/Hardware
-       install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/API2/Hardware
+       install -d $(PERLLIBDIR)/PVE/API2/Hardware
+       install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/API2/Hardware

diff --git a/PVE/API2/Makefile b/PVE/API2/Makefile
index 5c08ebe0361e3c95abaf3006dab39324e9d9129d..97f1cc202cc64b51c59c757a33c816620607dd4f 100644 (file)
--- a/PVE/API2/Makefile
+++ b/PVE/API2/Makefile
@@ -30,10 +30,10 @@ all:
 .PHONY: clean
 clean:
        rm -rf *~
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+       set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 
 .PHONY: install 
-install: ${PERLSOURCE}
-       install -d ${PERLLIBDIR}/PVE/API2
-       install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/API2
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+install: $(PERLSOURCE)
+       install -d $(PERLLIBDIR)/PVE/API2
+       install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/API2
+       set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done

diff --git a/PVE/CLI/Makefile b/PVE/CLI/Makefile
index bf79f7cdb81dcdfa5f6b8fabdb31189ea0c4182c..fc53f475e4d8de4bba7a7d229ec7a2faa674bb0c 100644 (file)
--- a/PVE/CLI/Makefile
+++ b/PVE/CLI/Makefile
@@ -5,9 +5,9 @@ SOURCES=vzdump.pm pvesubscription.pm pveceph.pm pveam.pm pvesr.pm pvenode.pm pve
 all:
 
 .PHONY: install
-install: ${SOURCES}
-       install -d -m 0755 ${PERLLIBDIR}/PVE/CLI
-       for i in ${SOURCES}; do install -D -m 0644 $$i ${PERLLIBDIR}/PVE/CLI/$$i; done
+install: $(SOURCES)
+       install -d -m 0755 $(PERLLIBDIR)/PVE/CLI
+       for i in $(SOURCES); do install -D -m 0644 $$i $(PERLLIBDIR)/PVE/CLI/$$i; done
 
 
 clean:

diff --git a/PVE/Ceph/Makefile b/PVE/Ceph/Makefile
index 8169f2357255c240c6c443846604aae2d51b7f73..ae62872089c36343ff03fbf01999e99ac71b15da 100644 (file)
--- a/PVE/Ceph/Makefile
+++ b/PVE/Ceph/Makefile
@@ -11,6 +11,6 @@ clean:
        rm -rf *~
 
 .PHONY: install
-install: ${PERLSOURCE}
-       install -d ${PERLLIBDIR}/PVE/Ceph
-       install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/Ceph
+install: $(PERLSOURCE)
+       install -d $(PERLLIBDIR)/PVE/Ceph
+       install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/Ceph

diff --git a/PVE/Jobs/Makefile b/PVE/Jobs/Makefile
index 34953e510ae4053da196daa1f3c6eadfc5a61a78..11aed0d1979ed9d0e90c3f901f0c376265849304 100644 (file)
--- a/PVE/Jobs/Makefile
+++ b/PVE/Jobs/Makefile
@@ -10,6 +10,6 @@ clean:
        rm -rf *~
 
 .PHONY: install
-install: ${PERLSOURCE}
-       install -d ${PERLLIBDIR}/PVE/Jobs
-       install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/Jobs
+install: $(PERLSOURCE)
+       install -d $(PERLLIBDIR)/PVE/Jobs
+       install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/Jobs

diff --git a/PVE/Makefile b/PVE/Makefile
index 48b85d332bfe7f86b9c0fdabeab5f8c80f779586..9a67db74d1fe60721aee571e6c0522460e407b64 100644 (file)
--- a/PVE/Makefile
+++ b/PVE/Makefile
@@ -16,24 +16,24 @@ PERLSOURCE =                        \
        Report.pm               \
        VZDump.pm
 
-all: pvecfg.pm ${SUBDIRS}
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
+all: pvecfg.pm $(SUBDIRS)
+       set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i; done
 
 pvecfg.pm: pvecfg.pm.in
-       sed -e s/@VERSION@/${VERSION}/ -e s/@PVERELEASE@/${PVERELEASE}/ -e s/@PACKAGE@/${PACKAGE}/ -e s/@REPOID@/${REPOID}/ $< >$@.tmp
+       sed -e s/@VERSION@/$(VERSION)/ -e s/@PVERELEASE@/$(PVERELEASE)/ -e s/@PACKAGE@/$(PACKAGE)/ -e s/@REPOID@/$(REPOID)/ $< >$@.tmp
        mv $@.tmp $@
 
 %:
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+       set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 
 .PHONY: clean
 clean:
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+       set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
        rm -rf *~ pvecfg.pm pvecfg.pm.tmp
 
 .PHONY: install 
-install: pvecfg.pm ${PERLSOURCE}
-       install -d ${PERLLIBDIR}/PVE
-       install -m 0644 pvecfg.pm ${PERLLIBDIR}/PVE/
-       install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+install: pvecfg.pm $(PERLSOURCE)
+       install -d $(PERLLIBDIR)/PVE
+       install -m 0644 pvecfg.pm $(PERLLIBDIR)/PVE/
+       install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/
+       set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done

diff --git a/PVE/Service/Makefile b/PVE/Service/Makefile
index f66ceb81cec1daeaa4a79b7866e833ab137609d1..b3f67d759d8839f801aafb170014ee4a890951fa 100644 (file)
--- a/PVE/Service/Makefile
+++ b/PVE/Service/Makefile
@@ -5,8 +5,8 @@ SOURCES=pvestatd.pm pveproxy.pm pvedaemon.pm spiceproxy.pm pvescheduler.pm
 all:
 
 .PHONY: install
-install: ${SOURCES}
-       install -d -m 0755 ${PERLLIBDIR}/PVE/Service
-       for i in ${SOURCES}; do install -D -m 0644 $$i ${PERLLIBDIR}/PVE/Service/$$i; done
+install: $(SOURCES)
+       install -d -m 0755 $(PERLLIBDIR)/PVE/Service
+       for i in $(SOURCES); do install -D -m 0644 $$i $(PERLLIBDIR)/PVE/Service/$$i; done
 
 clean:

diff --git a/PVE/Status/Makefile b/PVE/Status/Makefile
index f3731ef93788c7c13e168da09110ff2fc955333f..c2f2edbc48547d547635e2969b4b250a678e1dad 100644 (file)
--- a/PVE/Status/Makefile
+++ b/PVE/Status/Makefile
@@ -12,6 +12,6 @@ clean:
        rm -rf *~
 
 .PHONY: install 
-install: ${PERLSOURCE}
-       install -d ${PERLLIBDIR}/PVE/Status
-       install -m 0644 ${PERLSOURCE} ${PERLLIBDIR}/PVE/Status
+install: $(PERLSOURCE)
+       install -d $(PERLLIBDIR)/PVE/Status
+       install -m 0644 $(PERLSOURCE) $(PERLLIBDIR)/PVE/Status

diff --git a/aplinfo/Makefile b/aplinfo/Makefile
index 9663274d61dedb193f579a83cae5f3442c4ce81b..23ab4ac0e8dfc143d035620de9a16e403915cd4c 100644 (file)
--- a/aplinfo/Makefile
+++ b/aplinfo/Makefile
@@ -11,8 +11,8 @@ all:
 
 .PHONY: install
 install: aplinfo.dat trustedkeys.gpg
-       install -D -m 0644 aplinfo.dat ${DESTDIR}${DOCDIR}/aplinfo.dat
-       install -D -m 0644 trustedkeys.gpg ${DESTDIR}${DOCDIR}/trustedkeys.gpg
+       install -D -m 0644 aplinfo.dat $(DESTDIR)$(DOCDIR)/aplinfo.dat
+       install -D -m 0644 trustedkeys.gpg $(DESTDIR)$(DOCDIR)/trustedkeys.gpg
 
 .PHONY: update
 update:
@@ -20,7 +20,7 @@ update:
        wget http://download.proxmox.com/images/aplinfo-pve-7.dat -O aplinfo.dat.tmp
        mv aplinfo.dat.tmp aplinfo.dat
 
-trustedkeys.gpg: ${TRUSTED_KEYS}
+trustedkeys.gpg: $(TRUSTED_KEYS)
        sq keyring join -o $@.tmp *.pubkey proxmox-release-bookworm.gpg
        mv $@.tmp $@
 

diff --git a/bin/Makefile b/bin/Makefile
index 55e5f20d69bd799a6aa9f539fa5bf28965570362..9c6d4dfd20340e5071d34a753db9b1d9d9650eb7 100644 (file)
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -10,8 +10,8 @@ SERVICES = pvestatd pveproxy pvedaemon spiceproxy pvescheduler
 CLITOOLS = vzdump pvesubscription pveceph pveam pvesr pvenode pvesh pve6to7
 
 SCRIPTS =                      \
-       ${SERVICES}             \
-       ${CLITOOLS}             \
+       $(SERVICES)             \
+       $(CLITOOLS)             \
        pvebanner               \
        pveversion              \
        pveupgrade              \
@@ -19,28 +19,28 @@ SCRIPTS =                   \
        pveperf                 \
        pvereport
 
-SERVICE_MANS = $(addsuffix .8, ${SERVICES})
+SERVICE_MANS = $(addsuffix .8, $(SERVICES))
 
 CLI_MANS =                             \
-       $(addsuffix .1, ${CLITOOLS})    \
+       $(addsuffix .1, $(CLITOOLS))    \
        pveversion.1                    \
        pveupgrade.1                    \
        pveperf.1                       \
        pvereport.1                     \
 
 BASH_COMPLETIONS =                                             \
-       $(addsuffix .service-bash-completion, ${SERVICES})      \
-       $(addsuffix .bash-completion, ${CLITOOLS})              \
+       $(addsuffix .service-bash-completion, $(SERVICES))      \
+       $(addsuffix .bash-completion, $(CLITOOLS))              \
 
 ZSH_COMPLETIONS =                                              \
-       $(addsuffix .service-zsh-completion, ${SERVICES})       \
-       $(addsuffix .zsh-completion, ${CLITOOLS})               \
+       $(addsuffix .service-zsh-completion, $(SERVICES))       \
+       $(addsuffix .zsh-completion, $(CLITOOLS))               \
 
-all: ${SERVICE_MANS} ${CLI_MANS}
+all: $(SERVICE_MANS) $(CLI_MANS)
 
 %.1: %.1.pod
        rm -f $@
-       cat $<|pod2man -n $* -s 1 -r ${VERSION} -c"Proxmox Documentation" - >$@.tmp
+       cat $<|pod2man -n $* -s 1 -r $(VERSION) -c"Proxmox Documentation" - >$@.tmp
        mv $@.tmp $@
 
 %.1.pod:
@@ -56,28 +56,28 @@ pveupgrade.1.pod: pveupgrade
 pvereport.1.pod: pvereport
 
 .PHONY: check
-check: $(addsuffix .service-api-verified, ${SERVICES}) $(addsuffix .api-verified, ${CLITOOLS})
+check: $(addsuffix .service-api-verified, $(SERVICES)) $(addsuffix .api-verified, $(CLITOOLS))
        rm -f *.service-api-verified *.api-verified
 
 .PHONY: install
-install: ${SCRIPTS} ${CLI_MANS} ${SERVICE_MANS} ${BASH_COMPLETIONS} ${ZSH_COMPLETIONS}
-       install -d ${BINDIR}
-       install -m 0755 ${SCRIPTS} ${BINDIR}
-       install -d ${USRSHARE}/helpers
-       install -m 0755 pve-startall-delay ${USRSHARE}/helpers
-       install -d ${MAN1DIR}
-       install -m 0644 ${CLI_MANS} ${MAN1DIR}
-       install -d ${MAN8DIR}
-       install -m 0644 ${SERVICE_MANS} ${MAN8DIR}
-       for i in ${CLITOOLS}; do install -m 0644 -D $$i.bash-completion ${BASHCOMPLDIR}/$$i; done
-       for i in ${SERVICES}; do install -m 0644 -D $$i.service-bash-completion ${BASHCOMPLDIR}/$$i; done
-       for i in ${CLITOOLS}; do install -m 0644 -D $$i.zsh-completion ${ZSHCOMPLDIR}/_$$i; done
-       for i in ${SERVICES}; do install -m 0644 -D $$i.service-zsh-completion ${ZSHCOMPLDIR}/_$$i; done
+install: $(SCRIPTS) $(CLI_MANS) $(SERVICE_MANS) $(BASH_COMPLETIONS) $(ZSH_COMPLETIONS)
+       install -d $(BINDIR)
+       install -m 0755 $(SCRIPTS) $(BINDIR)
+       install -d $(USRSHARE)/helpers
+       install -m 0755 pve-startall-delay $(USRSHARE)/helpers
+       install -d $(MAN1DIR)
+       install -m 0644 $(CLI_MANS) $(MAN1DIR)
+       install -d $(MAN8DIR)
+       install -m 0644 $(SERVICE_MANS) $(MAN8DIR)
+       for i in $(CLITOOLS); do install -m 0644 -D $$i.bash-completion $(BASHCOMPLDIR)/$$i; done
+       for i in $(SERVICES); do install -m 0644 -D $$i.service-bash-completion $(BASHCOMPLDIR)/$$i; done
+       for i in $(CLITOOLS); do install -m 0644 -D $$i.zsh-completion $(ZSHCOMPLDIR)/_$$i; done
+       for i in $(SERVICES); do install -m 0644 -D $$i.service-zsh-completion $(ZSHCOMPLDIR)/_$$i; done
 
 .PHONY: clean
 clean:
        make cleanup-docgen
-       rm -rf *~ *.tmp ${CLI_MANS} ${SERVICE_MANS} *.1.pod *.8.pod                 \
+       rm -rf *~ *.tmp $(CLI_MANS) $(SERVICE_MANS) *.1.pod *.8.pod                 \
            *.bash-completion *.service-bash-completion                             \
            *.zsh-completion *.service-zsh-completion                               \
            *.api-verified *.service-api-verified

diff --git a/configs/Makefile b/configs/Makefile
index 04cf349f138576745f781a7d3150999988a9f7a5..fd446b5bc6afc85aa27ccc59c3ef3fcef7e9ff86 100644 (file)
--- a/configs/Makefile
+++ b/configs/Makefile
@@ -7,12 +7,12 @@ country.dat: country.pl
 
 .PHONY: install
 install: country.dat vzdump.conf pve-sources.list pve-initramfs.conf pve-blacklist.conf pve.logrotate
-       install -D -m 0644 pve.logrotate ${DESTDIR}/etc/logrotate.d/pve
-       install -D -m 0644 pve-sources.list ${DESTDIR}/etc/apt/sources.list.d/pve-enterprise.list
-       install -D -m 0644 pve-blacklist.conf ${DESTDIR}/etc/modprobe.d/pve-blacklist.conf
-       install -D -m 0644 vzdump.conf ${DESTDIR}/etc/vzdump.conf
-       install -D -m 0644 pve-initramfs.conf ${DESTDIR}/etc/initramfs-tools/conf.d/pve-initramfs.conf
-       install -D -m 0644 country.dat ${DESTDIR}/usr/share/${PACKAGE}/country.dat
+       install -D -m 0644 pve.logrotate $(DESTDIR)/etc/logrotate.d/pve
+       install -D -m 0644 pve-sources.list $(DESTDIR)/etc/apt/sources.list.d/pve-enterprise.list
+       install -D -m 0644 pve-blacklist.conf $(DESTDIR)/etc/modprobe.d/pve-blacklist.conf
+       install -D -m 0644 vzdump.conf $(DESTDIR)/etc/vzdump.conf
+       install -D -m 0644 pve-initramfs.conf $(DESTDIR)/etc/initramfs-tools/conf.d/pve-initramfs.conf
+       install -D -m 0644 country.dat $(DESTDIR)/usr/share/$(PACKAGE)/country.dat
 
 clean:
        rm -f country.dat

diff --git a/network-hooks/Makefile b/network-hooks/Makefile
index b6a06dd9e83158c12993414d1e1a4c0bc87a6374..6afe3632f496550695720c22d07df738ff668cd0 100644 (file)
--- a/network-hooks/Makefile
+++ b/network-hooks/Makefile
@@ -4,10 +4,10 @@ all:
 
 .PHONY: install
 install: mtu bridgevlan bridgevlanport vlan vlan-down
-       install -D -m 0755 mtu ${DESTDIR}/etc/network/if-up.d/mtu
-       install -D -m 0755 bridgevlan ${DESTDIR}/etc/network/if-up.d/bridgevlan
-       install -D -m 0755 bridgevlanport ${DESTDIR}/etc/network/if-up.d/bridgevlanport
-       install -D -m 0755 vlan ${DESTDIR}/etc/network/if-pre-up.d/vlan
-       install -D -m 0755 vlan-down ${DESTDIR}/etc/network/if-post-down.d/vlan
+       install -D -m 0755 mtu $(DESTDIR)/etc/network/if-up.d/mtu
+       install -D -m 0755 bridgevlan $(DESTDIR)/etc/network/if-up.d/bridgevlan
+       install -D -m 0755 bridgevlanport $(DESTDIR)/etc/network/if-up.d/bridgevlanport
+       install -D -m 0755 vlan $(DESTDIR)/etc/network/if-pre-up.d/vlan
+       install -D -m 0755 vlan-down $(DESTDIR)/etc/network/if-post-down.d/vlan
 
 clean:

diff --git a/services/Makefile b/services/Makefile
index 75809a3747ac6505276798d4f31cfd8f0787de99..8a60fa9bbb22c438cebea6d6db15559cdbbc873d 100644 (file)
--- a/services/Makefile
+++ b/services/Makefile
@@ -16,20 +16,20 @@ SERVICES=                   \
        pvescheduler.service
 
 .PHONY: install
-install: ${SERVICES}
-       install -d ${SERVICEDIR}
-       install -m 0644 ${SERVICES} ${SERVICEDIR}
-       install -d ${SERVICEDIR}/ceph-mon@.service.d
-       install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mon@.service.d
-       install -d ${SERVICEDIR}/ceph-mgr@.service.d
-       install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mgr@.service.d
-       install -d ${SERVICEDIR}/ceph-osd@.service.d
-       install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-osd@.service.d
-       install -d ${SERVICEDIR}/ceph-volume@.service.d
-       install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-volume@.service.d
-       install -d ${SERVICEDIR}/ceph-mds@.service.d
-       install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mds@.service.d
-       install -d ${DESTDIR}/usr/share/doc/${PACKAGE}/examples/
+install: $(SERVICES)
+       install -d $(SERVICEDIR)
+       install -m 0644 $(SERVICES) $(SERVICEDIR)
+       install -d $(SERVICEDIR)/ceph-mon@.service.d
+       install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-mon@.service.d
+       install -d $(SERVICEDIR)/ceph-mgr@.service.d
+       install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-mgr@.service.d
+       install -d $(SERVICEDIR)/ceph-osd@.service.d
+       install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-osd@.service.d
+       install -d $(SERVICEDIR)/ceph-volume@.service.d
+       install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-volume@.service.d
+       install -d $(SERVICEDIR)/ceph-mds@.service.d
+       install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-mds@.service.d
+       install -d $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/
 
 .PHONY: clean
 clean:

diff --git a/www/Makefile b/www/Makefile
index 8c12453dd46f69d97d0792bb28f7a3276a3635d0..747247c5224a6643d9dddb6142c88ebfbb67fc38 100644 (file)
--- a/www/Makefile
+++ b/www/Makefile
@@ -5,15 +5,15 @@ all:
 
 .PHONY: install
 install:
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
-       install -m 0644 index.html.tpl ${WWWBASEDIR}
-       install -d ${WWWJSDIR}
-       install -m 0644 u2f-api.js ${WWWJSDIR}
+       set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
+       install -m 0644 index.html.tpl $(WWWBASEDIR)
+       install -d $(WWWJSDIR)
+       install -m 0644 u2f-api.js $(WWWJSDIR)
 
 .PHONY: check
 check:
-       ${MAKE} -C manager6 $@
+       $(MAKE) -C manager6 $@
 
 .PHONY: clean
 clean:
-       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
+       set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done

diff --git a/www/css/Makefile b/www/css/Makefile
index 3960292c6e623acaa1a624db1bcf90cdf5549384..e4d5c14e2492c7bdd36084f9d958253be61f03a7 100644 (file)
--- a/www/css/Makefile
+++ b/www/css/Makefile
@@ -4,8 +4,8 @@ all:
 
 .PHONY: install
 install: ext6-pve.css
-       install -d ${WWWCSSDIR}
-       install -m 0644 $? ${WWWCSSDIR}
+       install -d $(WWWCSSDIR)
+       install -m 0644 $? $(WWWCSSDIR)
 
 .PHONY: clean
 clean:

diff --git a/www/css/fonts/Makefile b/www/css/fonts/Makefile
index d957edce18ea4b5105aac86a89d021ada26300e4..9676534c0c0c190a3a755e1ba4b3e892fc0d4fc2 100644 (file)
--- a/www/css/fonts/Makefile
+++ b/www/css/fonts/Makefile
@@ -4,8 +4,8 @@ all:
 
 .PHONY: install 
 install: README fontawesome-webfont.ttf FontAwesome.otf fontawesome-webfont.woff2 fontawesome-webfont.svg fontawesome-webfont.woff fontawesome-webfont.eot
-       install -d ${WWWFONTSDIR}
-       install -m 0644 $? ${WWWFONTSDIR}
+       install -d $(WWWFONTSDIR)
+       install -m 0644 $? $(WWWFONTSDIR)
 
 .PHONY: clean
 clean:

diff --git a/www/images/Makefile b/www/images/Makefile
index 7e7fcb547979f6d2adb3fc7ecdbecbe2bb9c4d43..ad39c8c50bfc1d31c2b68a154be063f97b5b9b24 100644 (file)
--- a/www/images/Makefile
+++ b/www/images/Makefile
@@ -46,7 +46,7 @@ GNOME_IMAGES =                        \
        computer-template.png   \
        computer.png
 
-IMAGES = ${GNOME_IMAGES}       \
+IMAGES = $(GNOME_IMAGES)       \
        virt-viewer.png         \
        tigervnc.png            \
        novnc.png               \
@@ -89,9 +89,9 @@ icon-sdn.svg: icon-sdn.dot
        fdp -Tsvg $< > $@
 
 .PHONY: install 
-install: ${IMAGES}
-       install -d ${WWWIMAGEDIR}
-       install -m 0644 ${IMAGES} ${WWWIMAGEDIR}
+install: $(IMAGES)
+       install -d $(WWWIMAGEDIR)
+       install -m 0644 $(IMAGES) $(WWWIMAGEDIR)
 
 .PHONY: clean
 clean:

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 2b577c8e55488c199bfbe2eba7a3a18e6c1483a5..336355abf63213b82ad1695da5800f8ec4ad0f62 100644 (file)
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -302,32 +302,31 @@ WIDGETKIT=/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
 
 all:
 
-.lint-incremental: ${JSSRC}
+.lint-incremental: $(JSSRC)
        eslint $?
        touch "$@"
 
 .PHONY: lint
 check: lint
-lint: ${JSSRC}
-       eslint --strict ${JSSRC}
+lint: $(JSSRC)
+       eslint --strict $(JSSRC)
        touch ".lint-incremental"
 
-pvemanagerlib.js: .lint-incremental OnlineHelpInfo.js ${JSSRC}
-       cat OnlineHelpInfo.js ${JSSRC} >$@.tmp
+pvemanagerlib.js: .lint-incremental OnlineHelpInfo.js $(JSSRC)
+       cat OnlineHelpInfo.js $(JSSRC) >$@.tmp
        mv $@.tmp $@
 
-OnlineHelpInfo.js: ${JSSRC} ${WIDGETKIT}
+OnlineHelpInfo.js: $(JSSRC) $(WIDGETKIT)
        /usr/bin/asciidoc-pve scan-extjs $^ >$@.tmp
        mv $@.tmp $@
 
 .PHONY: install
 install: pvemanagerlib.js
-       install -d ${WWWJSDIR}
-       install -m 0644 pvemanagerlib.js ${WWWJSDIR}
+       install -d $(WWWJSDIR)
+       install -m 0644 pvemanagerlib.js $(WWWJSDIR)
 
 .PHONY: clean
 clean:
-       find . -name '*~' -exec rm {} ';'
        rm -rf pvemanagerlib.js OnlineHelpInfo.js .lint-incremental
 
 

diff --git a/www/mobile/Makefile b/www/mobile/Makefile
index cb2512c04f1fb3143692e027ff9f9d18f51e6e2f..543e89e90953958d2fef895b1ac47a4e67a88783 100644 (file)
--- a/www/mobile/Makefile
+++ b/www/mobile/Makefile
@@ -28,16 +28,16 @@ JSSRC=                                                      \
 
 all:
 
-pvemanager-mobile.js: ${JSSRC}
-       cat ${JSSRC} >$@.tmp
+pvemanager-mobile.js: $(JSSRC)
+       cat $(JSSRC) >$@.tmp
        mv $@.tmp $@
 
 .PHONY: install 
 install: pvemanager-mobile.js index.html.tpl pve.css
-       install -d ${WWWTOUCHDIR}
-       install -m 0644 index.html.tpl ${WWWTOUCHDIR}
-       install -m 0644 pve.css ${WWWTOUCHDIR}
-       install -m 0644 pvemanager-mobile.js ${WWWTOUCHDIR}
+       install -d $(WWWTOUCHDIR)
+       install -m 0644 index.html.tpl $(WWWTOUCHDIR)
+       install -m 0644 pve.css $(WWWTOUCHDIR)
+       install -m 0644 pvemanager-mobile.js $(WWWTOUCHDIR)
 
 .PHONY: clean
 clean: