src makefiles: convert to use simple parenthesis

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

diff --git a/src/Makefile b/src/Makefile
index 995f27e2357e41d1ddeb0101fb74457e9262c319..5e1ffd7623bec68d62653fa62c397ab554f31ad3 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,15 +2,15 @@ PACKAGE ?= libpve-access-control
 
 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/
-
-export PERLDIR=${PREFIX}/share/perl5
+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
 -include /usr/share/pve-doc-generator/pve-doc-generator.mk
 
 all:
@@ -25,16 +25,16 @@ pveum.zsh-completion: PVE/CLI/pveum.pm
 
 .PHONY: install
 install: pveum.1 oathkeygen pveum.bash-completion pveum.zsh-completion
-       install -d ${DESTDIR}${BINDIR}
-       install -d ${DESTDIR}${SBINDIR}
-       install -m 0755 pveum ${DESTDIR}${SBINDIR}
-       install -m 0755 oathkeygen ${DESTDIR}${BINDIR}
+       install -d $(DESTDIR)$(BINDIR)
+       install -d $(DESTDIR)$(SBINDIR)
+       install -m 0755 pveum $(DESTDIR)$(SBINDIR)
+       install -m 0755 oathkeygen $(DESTDIR)$(BINDIR)
        make -C PVE install
-       install -d ${DESTDIR}/${MAN1DIR}
-       install -d ${DESTDIR}/${DOCDIR}
-       install -m 0644 pveum.1 ${DESTDIR}/${MAN1DIR}
-       install -m 0644 -D pveum.bash-completion ${DESTDIR}${BASHCOMPLDIR}/pveum
-       install -m 0644 -D pveum.zsh-completion ${DESTDIR}${ZSHCOMPLDIR}/_pveum
+       install -d $(DESTDIR)/$(MAN1DIR)
+       install -d $(DESTDIR)/$(DOCDIR)
+       install -m 0644 pveum.1 $(DESTDIR)/$(MAN1DIR)
+       install -m 0644 -D pveum.bash-completion $(DESTDIR)$(BASHCOMPLDIR)/pveum
+       install -m 0644 -D pveum.zsh-completion $(DESTDIR)$(ZSHCOMPLDIR)/_pveum
 
 .PHONY: test
 test:

diff --git a/src/PVE/API2/Makefile b/src/PVE/API2/Makefile
index 2817f4887d91a3fe5e0e6cfb17660af2b057eead..81ecc06482e53c7e882d5b3953210c56d996b55b 100644 (file)
--- a/src/PVE/API2/Makefile
+++ b/src/PVE/API2/Makefile
@@ -11,4 +11,4 @@ API2_SOURCES=                         \
 
 .PHONY: install
 install:
-       for i in ${API2_SOURCES}; do install -D -m 0644 $$i ${DESTDIR}${PERLDIR}/PVE/API2/$$i; done
+       for i in $(API2_SOURCES); do install -D -m 0644 $$i $(DESTDIR)$(PERLDIR)/PVE/API2/$$i; done

diff --git a/src/PVE/Auth/Makefile b/src/PVE/Auth/Makefile
index be7bde3cbb48ea4d276a55c44116883f86745ef8..a5c4cde9baf803256d6d0601270adf52a9031e69 100644 (file)
--- a/src/PVE/Auth/Makefile
+++ b/src/PVE/Auth/Makefile
@@ -9,4 +9,4 @@ AUTH_SOURCES=                   \
 
 .PHONY: install
 install:
-       for i in ${AUTH_SOURCES}; do install -D -m 0644 $$i ${DESTDIR}${PERLDIR}/PVE/Auth/$$i; done
+       for i in $(AUTH_SOURCES); do install -D -m 0644 $$i $(DESTDIR)$(PERLDIR)/PVE/Auth/$$i; done

diff --git a/src/PVE/CLI/Makefile b/src/PVE/CLI/Makefile
index 30542124e1ef8fa68db60897c2d1cfb13e7f7df8..582814b237e66b3322064ba8da331cccc5701afc 100644 (file)
--- a/src/PVE/CLI/Makefile
+++ b/src/PVE/CLI/Makefile
@@ -1,9 +1,9 @@
 SOURCES=pveum.pm
 
 .PHONY: install
-install: ${SOURCES}
-       install -d -m 0755 ${DESTDIR}${PERLDIR}/PVE/CLI
-       for i in ${SOURCES}; do install -D -m 0644 $$i ${DESTDIR}${PERLDIR}/PVE/CLI/$$i; done
+install: $(SOURCES)
+       install -d -m 0755 $(DESTDIR)$(PERLDIR)/PVE/CLI
+       for i in $(SOURCES); do install -D -m 0644 $$i $(DESTDIR)$(PERLDIR)/PVE/CLI/$$i; done
 
 
 clean:

diff --git a/src/PVE/Makefile b/src/PVE/Makefile
index c839d8f3f225dff14da76f324284dbba3bc0e073..71a59a26cd2398a65f3617a0d31657c0821e6871 100644 (file)
--- a/src/PVE/Makefile
+++ b/src/PVE/Makefile
@@ -3,8 +3,8 @@
 .PHONY: install
 install:
        make -C Auth install
-       install -D -m 0644 AccessControl.pm ${DESTDIR}${PERLDIR}/PVE/AccessControl.pm
-       install -D -m 0644 RPCEnvironment.pm ${DESTDIR}${PERLDIR}/PVE/RPCEnvironment.pm
-       install -D -m 0644 TokenConfig.pm ${DESTDIR}${PERLDIR}/PVE/TokenConfig.pm
+       install -D -m 0644 AccessControl.pm $(DESTDIR)$(PERLDIR)/PVE/AccessControl.pm
+       install -D -m 0644 RPCEnvironment.pm $(DESTDIR)$(PERLDIR)/PVE/RPCEnvironment.pm
+       install -D -m 0644 TokenConfig.pm $(DESTDIR)$(PERLDIR)/PVE/TokenConfig.pm
        make -C API2 install
        make -C CLI install