[pve-devel] [PATCH novnc v2 2/3] add BUILDDIR to clean make target

[Thomas Lamprecht]

Am 12.11.24 um 08:51 schrieb Dominik Csapak:
> so it gets cleaned up too
> 
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
> new in v2
> 
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 431dff9..d1159e0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -57,7 +57,7 @@ distclean: clean
>  
>  .PHONY: clean
>  clean:
> -	rm -rf $(PACKAGE)-[0-9]*/ $() *.deb *.dsc $(PACKAGE)*.tar.[gx]z *.changes *.dsc *.buildinfo *.build
> +	rm -rf $(BUILDDIR) $(PACKAGE)-[0-9]*/ $() *.deb *.dsc $(PACKAGE)*.tar.[gx]z *.changes *.dsc *.buildinfo *.build
>  
>  .PHONY: dinstall
>  dinstall: deb

I replaced this with changing the build-dir to be derived from package
name and upstream version, like most modern packages of ours (and using
dget on debian source packages) do. The clean target already assumed this
to be the case.

diff --git a/Makefile b/Makefile
index 431dff9..1df5937 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ include /usr/share/dpkg/default.mk
 PACKAGE=novnc-pve
 
 SRCDIR=novnc
-BUILDDIR=$(SRCDIR).tmp
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 ORIG_SRC_TAR=$(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
 
 GITVERSION:=$(shell git rev-parse HEAD)

Also adapted the build-dir target to be atomic in another, unrelated,
follow-up.