From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Sun, 25 Jun 2023 13:27:07 +0000 (+0200)
Subject: buildsys: use more telling BUILDDIR variable name
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=184cb476e667984478ff2dd6941186eedd5aee3c;p=proxmox-spamassassin.git

buildsys: use more telling BUILDDIR variable name

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

diff --git a/Makefile b/Makefile
index f67c64d..52bdf98 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,13 @@ include /usr/share/dpkg/default.mk
 PACKAGE = proxmox-spamassassin
 
 OPKGNAME = Mail-SpamAssassin-$(DEB_VERSION_UPSTREAM)
-NPKGNAME = proxmox-spamassassin_$(DEB_VERSION_UPSTREAM)
+
+BUILDDIR = $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
+DSC = $(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
+
 DEB = $(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_amd64.deb
 DBG_DEB = $(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_amd64.deb
 DEBS = $(DEB) $(DBG_DEB)
-DSC = $(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
 
 KAM_CHANNEL_FILE = debian/tree/etc/mail/spamassassin/channel.d/KAM_channel.conf
 KAM_KEYID = $(shell awk -F '=' '/^KEYID/ { print $$2 }' $(KAM_CHANNEL_FILE))
@@ -22,16 +24,16 @@ SA_UPDATE_GPG_DIR = .sa-update-gpghome
 
 deb: $(DEB)
 
-$(DEB) $(DBG_DEB): $(NPKGNAME)
-	cd $(NPKGNAME); dpkg-buildpackage -b -us -uc -rfakeroot
+$(DEB) $(DBG_DEB): $(BUILDDIR)
+	cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
 	lintian $(DEB)
 
 dsc:
 	$(MAKE) $(DSC)
 	lintian $(DSC)
 
-$(DSC): $(NPKGNAME)
-	cd $(NPKGNAME); dpkg-buildpackage -S -us -uc -rfakeroot -d
+$(DSC): $(BUILDDIR)
+	cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
 
 .PHONY: sbuild
 sbuild: $(DSC)
@@ -43,12 +45,12 @@ update-upstream: $(OPKGNAME).tar.gz
 	tar -xzf $<
 	mv $(OPKGNAME) upstream
 
-$(NPKGNAME).orig.tar.gz: upstream/
+$(BUILDDIR).orig.tar.gz: upstream/
 	rm -rf $(NPKGNAME)
 	cp -a upstream $(NPKGNAME)
 	tar -czf $@ $(NPKGNAME)
 
-$(NPKGNAME): sa-updates kam-updates $(NPKGNAME).orig.tar.gz
+$(BUILDDIR): sa-updates kam-updates $(NPKGNAME).orig.tar.gz
 	cp -a debian $@
 	mkdir -p $@/debian/tree/usr/share/spamassassin
 	rsync -av sa-updates/ $@/debian/tree/usr/share/spamassassin