]> git.proxmox.com Git - pve-eslint.git/commitdiff
buildsys: switch to regular parenthesis
authorDominik Csapak <d.csapak@proxmox.com>
Tue, 23 May 2023 07:54:28 +0000 (09:54 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Wed, 24 May 2023 16:51:55 +0000 (18:51 +0200)
for consistency and ease of use with QWERTZ layouts

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Makefile

index 57d52b37cad656c5a2ff92893220ac3ffd59a497..20ac0aa6e1b421200166cd47f358042066caa2c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,58 +3,58 @@ include /usr/share/dpkg/pkg-info.mk
 PACKAGE=pve-eslint
 
 GITVERSION:=$(shell git rev-parse HEAD)
-BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
-DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
-DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
+DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
+DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
 
 SRCDIR=src
 UPSTREAM=eslint
 UPSTREAMTAG=v8.41.0
-BUILDSRC=${UPSTREAM}-${UPSTREAMTAG}
+BUILDSRC=$(UPSTREAM)-$(UPSTREAMTAG)
 
-all: ${DEB}
-       @echo ${DEB}
+all: $(DEB)
+       @echo $(DEB)
 
 .PHONY: dsc deb builddir
 
-${BUILDDIR}: builddir
-builddir: ${SRCDIR}
-       rm -rf ${BUILDDIR}
-       mkdir ${BUILDDIR}
-       cp -a debian ${BUILDDIR}/
-       cp -a ${SRCDIR}/* ${BUILDDIR}/
-       echo "git clone git://git.proxmox.com/git/pve-eslint.git\\ngit checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE
+$(BUILDDIR): builddir
+builddir: $(SRCDIR)
+       rm -rf $(BUILDDIR)
+       mkdir $(BUILDDIR)
+       cp -a debian $(BUILDDIR)/
+       cp -a $(SRCDIR)/* $(BUILDDIR)/
+       echo "git clone git://git.proxmox.com/git/pve-eslint.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
 
 
-dsc: ${DSC}
-${DSC}: builddir
-       cd ${BUILDDIR}; dpkg-buildpackage -S -uc -us
-       lintian ${DSC}
+dsc: $(DSC)
+$(DSC): builddir
+       cd $(BUILDDIR); dpkg-buildpackage -S -uc -us
+       lintian $(DSC)
 
-deb: ${DEB}
-${DEB}: builddir
-       cd ${BUILDDIR}; dpkg-buildpackage -b -uc -us
-       lintian ${DEB}
-       @echo ${DEB}
+deb: $(DEB)
+$(DEB): builddir
+       cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
+       lintian $(DEB)
+       @echo $(DEB)
 
 .PHONY: download
 download:
-       rm -rf ${UPSTREAM}.tmp ${UPSTREAM}
-       git clone -b ${UPSTREAMTAG} --depth 1 https://github.com/eslint/eslint ${UPSTREAM}.tmp
-       rm -rf ${UPSTREAM}.tmp/.git
-       find ${UPSTREAM}.tmp/ -type f -name '.gitignore' -delete
-       mv ${UPSTREAM}.tmp ${UPSTREAM}
+       rm -rf $(UPSTREAM).tmp $(UPSTREAM)
+       git clone -b $(UPSTREAMTAG) --depth 1 https://github.com/eslint/eslint $(UPSTREAM).tmp
+       rm -rf $(UPSTREAM).tmp/.git
+       find $(UPSTREAM).tmp/ -type f -name '.gitignore' -delete
+       mv $(UPSTREAM).tmp $(UPSTREAM)
 
 # NOTE: needs npm installed, downloads packages from npm
 .PHONY: buildupstream
-buildupstream: ${BUILDSRC}
-       cp ${BUILDSRC}/build/eslint.js ${SRCDIR}/lib/eslint.js
+buildupstream: $(BUILDSRC)
+       cp $(BUILDSRC)/build/eslint.js $(SRCDIR)/lib/eslint.js
 
-${BUILDSRC}: ${UPSTREAM} patches
+$(BUILDSRC): $(UPSTREAM) patches
        rm -rf $@
        mkdir $@.tmp
-       rsync -ra ${UPSTREAM}/ $@.tmp
+       rsync -ra $(UPSTREAM)/ $@.tmp
        cd $@.tmp; ln -s ../patches patches
        cd $@.tmp; quilt push -a
        cd $@.tmp; rm -rf .pc ./patches
@@ -63,16 +63,16 @@ ${BUILDSRC}: ${UPSTREAM} patches
        cd $@; npm run build:webpack
 
 .PHONY: upload
-upload: ${DEB}
-       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product devel --dist bullseye
+upload: $(DEB)
+       tar cf - $(DEB) | ssh -X repoman@repo.proxmox.com -- upload --product devel --dist bullseye
 
 .PHONY: distclean
 distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf *~ debian/*~ *.deb ${BUILDSRC} *.tmp/ ${BUILDDIR} *.changes *.tar.gz *.dsc *.buildinfo
+       rm -rf *~ debian/*~ *.deb $(BUILDSRC) *.tmp/ $(BUILDDIR) *.changes *.tar.gz *.dsc *.buildinfo
 
 .PHONY: dinstall
 dinstall: deb
-       dpkg -i ${DEB}
+       dpkg -i $(DEB)