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>
Patrick Steinhardt committed
Mar 11, 2025 at 11:26 UTC
d821fc62691680df6454d62b4f9e9409086b2873
1 file changed
+2
-5
Makefile
+2
-5
@@ -9,9 +9,6 @@ all::
9
10
GIT-VERSION-FILE: FORCE
11
@$(SHELL_PATH) ./GIT-VERSION-GEN . $@
12
-ifneq ($(MAKECMDGOALS),clean)
13
--include GIT-VERSION-FILE
14
-endif
12
13
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
14
uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
@@ -262,9 +259,9 @@ endif
259
$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(REMOVE_D1)
260
$(QUIET)$(REMOVE_D0)`dirname '$(DESTDIR_SQ)$(libdir_SQ)'` $(REMOVE_D1)
261
265
-dist-version:
262
+dist-version: GIT-VERSION-FILE
263
@mkdir -p $(TARDIR)
267
- @echo $(GITGUI_VERSION) > $(TARDIR)/version
264
+ @sed 's|^GITGUI_VERSION=||' <GIT-VERSION-FILE >$(TARDIR)/version
265
266
clean::
267
$(RM_RF) $(GITGUI_MAIN) lib/tclIndex po/*.msg $(PO_TEMPLATE)