From: Patrick Steinhardt <ps@pks.im>
Date: Tue, 11 Mar 2025 10:26:48 +0000 (+0100)
Subject: git-gui: stop including GIT-VERSION-FILE file
X-Git-Tag: v2.50.0-rc1~17^2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d821fc62691680df6454d62b4f9e9409086b2873;p=thirdparty%2Fgit.git

git-gui: stop including GIT-VERSION-FILE file

The "GITGUI_VERSION" variable is made available by generating and
including the "GIT-VERSION-FILE" file. Its value has been used in
various build steps, but in the preceding commits we have refactored
those to instead source the "GIT-VERSION-FILE" directly. As a result,
the variable is now only used in a single recipe, and this use can be
trivially replaced with sed(1).

Refactor the recipe to do so and stop including "GIT-VERSION-FILE" to
simplify the build process.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---

diff --git a/Makefile b/Makefile
index cde1b7e607..315888f302 100644
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,6 @@ all::
 
 GIT-VERSION-FILE: FORCE
 	@$(SHELL_PATH) ./GIT-VERSION-GEN . $@
-ifneq ($(MAKECMDGOALS),clean)
--include GIT-VERSION-FILE
-endif
 
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
@@ -262,9 +259,9 @@ endif
 	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(REMOVE_D1)
 	$(QUIET)$(REMOVE_D0)`dirname '$(DESTDIR_SQ)$(libdir_SQ)'` $(REMOVE_D1)
 
-dist-version:
+dist-version: GIT-VERSION-FILE
 	@mkdir -p $(TARDIR)
-	@echo $(GITGUI_VERSION) > $(TARDIR)/version
+	@sed 's|^GITGUI_VERSION=||' <GIT-VERSION-FILE  >$(TARDIR)/version
 
 clean::
 	$(RM_RF) $(GITGUI_MAIN) lib/tclIndex po/*.msg $(PO_TEMPLATE)