fix(rules): Exclude excess version info from tagged dist packaging

theleagueof · Jan 9, 2021 · c1beed7 · c1beed7
1 parent 7222d35
commit c1beed7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/rules/rules.mk b/rules/rules.mk
@@ -141,6 +141,7 @@ debug:
 	echo "isTagged = $(isTagged)"
 	echo "isVariable = $(isVariable)"
 	echo "CANONICAL = $(CANONICAL)"
+	echo "DISTDIR = $(DISTDIR)"
 	echo "----------------------------"
 	echo "SOURCES = $(SOURCES)"
 	echo "SOURCES_SFD = $(SOURCES_SFD)"
@@ -345,7 +346,7 @@ $(BUILDDIR)/last-commit: $$(forceiftagchange) | $(BUILDDIR)
 	git diff-index --quiet --cached HEAD -- $(SOURCES)
 	echo $(GitVersion) > $@
 
-DISTDIR = $(PROJECT)-$(GitVersion)
+DISTDIR ?= $(PROJECT)-$(if $(isTagged),$(FontVersion),$(GitVersion))
 
 $(DISTDIR):
 	mkdir -p $@