From 6658bc41a8d66afbf348126f8adcffe86227e2e1 Mon Sep 17 00:00:00 2001
From: Alejandro Colomar <alx@kernel.org>
Date: Tue, 19 Mar 2024 13:30:30 +0100
Subject: share/mk/: Rename variables

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
 share/mk/dist/check/diffoscope.mk |  2 +-
 share/mk/dist/check/tar.mk        |  2 +-
 share/mk/dist/tar.mk              |  7 ++++---
 share/mk/dist/z.mk                | 14 +++++++-------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/share/mk/dist/check/diffoscope.mk b/share/mk/dist/check/diffoscope.mk
index 335746c33..33bcf30ec 100644
--- a/share/mk/dist/check/diffoscope.mk
+++ b/share/mk/dist/check/diffoscope.mk
@@ -13,7 +13,7 @@ include $(MAKEFILEDIR)/dist/check/dist.mk
 include $(MAKEFILEDIR)/dist/tar.mk
 
 
-$(builddir)/distcheck.diffoscope.touch: $(DISTFILE) $(REDIST) | $$(@D)/
+$(builddir)/distcheck.diffoscope.touch: $(_DISTFILE) $(REDIST) | $$(@D)/
 	$(info	$(INFO_)DIFFOSCOPE	$^)
 	$(DIFFOSCOPE) $^
 	$(TOUCH) $@
diff --git a/share/mk/dist/check/tar.mk b/share/mk/dist/check/tar.mk
index 271680323..bd28ce56b 100644
--- a/share/mk/dist/check/tar.mk
+++ b/share/mk/dist/check/tar.mk
@@ -13,7 +13,7 @@ include $(MAKEFILEDIR)/dist/check/_.mk
 include $(MAKEFILEDIR)/dist/tar.mk
 
 
-$(_DISTCHECKDIR)/$(DISTNAME).tar: $(DISTFILE) $(MK) | $$(@D)/
+$(_DISTCHECKDIR)/$(DISTFILE): $(_DISTFILE) $(MK) | $$(@D)/
 	$(info	$(INFO_)CP		$@)
 	$(CP) -T $< $@
 
diff --git a/share/mk/dist/tar.mk b/share/mk/dist/tar.mk
index c90a9ef48..a87557f0a 100644
--- a/share/mk/dist/tar.mk
+++ b/share/mk/dist/tar.mk
@@ -16,10 +16,11 @@ include $(MAKEFILEDIR)/dist/_.mk
 include $(MAKEFILEDIR)/dist/files.mk
 
 
-DISTFILE := $(builddir)/$(DISTNAME).tar
+DISTFILE  := $(DISTNAME).tar
+_DISTFILE := $(builddir)/$(DISTFILE)
 
 
-$(DISTFILE): $(_DISTFILES) $(MK) | $$(@D)/
+$(_DISTFILE): $(_DISTFILES) $(MK) | $$(@D)/
 	$(info	$(INFO_)TAR		$@)
 	$(TAR) $(TARFLAGS) -cf $@ -T /dev/null
 	$(DISTFILESCMD) \
@@ -30,7 +31,7 @@ $(DISTFILE): $(_DISTFILES) $(MK) | $$(@D)/
 
 
 .PHONY: dist-tar
-dist-tar: $(DISTFILE);
+dist-tar: $(_DISTFILE);
 
 
 endif  # include guard
diff --git a/share/mk/dist/z.mk b/share/mk/dist/z.mk
index ae2858354..b4b34fc13 100644
--- a/share/mk/dist/z.mk
+++ b/share/mk/dist/z.mk
@@ -17,24 +17,24 @@ include $(MAKEFILEDIR)/dist/tar.mk
 compression := bz2 gz lz xz
 
 
-define DISTFILE_z_rule
-$(DISTFILE).$(2): %.$(2): % $(MK) | $$$$(@D)/
+define _DISTFILE_z_rule
+$(_DISTFILE).$(2): %.$(2): % $(MK) | $$$$(@D)/
 	$$(info	$(INFO_)$(1)		$$@)
 	$($(1)) $($(1)FLAGS) -kf $$<
 	$(TOUCH) $$@
 endef
 
 
-$(eval $(call DISTFILE_z_rule,BZIP2,bz2))
-$(eval $(call DISTFILE_z_rule,GZIP,gz))
-$(eval $(call DISTFILE_z_rule,LZIP,lz))
-$(eval $(call DISTFILE_z_rule,XZ,xz))
+$(eval $(call _DISTFILE_z_rule,BZIP2,bz2))
+$(eval $(call _DISTFILE_z_rule,GZIP,gz))
+$(eval $(call _DISTFILE_z_rule,LZIP,lz))
+$(eval $(call _DISTFILE_z_rule,XZ,xz))
 
 
 $(foreach z, $(compression),                                                  \
 	$(eval .PHONY: dist-z-$(z)))
 $(foreach z, $(compression),                                                  \
-	$(eval dist-z-$(z): $(DISTFILE).$(z);))
+	$(eval dist-z-$(z): $(_DISTFILE).$(z);))
 
 
 .PHONY: dist-z
-- 
cgit v1.2.3