[PATCH v0 1/4] git gui Makefile - remove Cygwin modiifications
- From
Mark Levedahl <mlevedahl@gmail.com>
- Date
- Jun 24, 2023, 21:23 UTC
- Message-ID
- <20230624212347.179656-2-mlevedahl@gmail.com>
- In-Reply-To
- <20230624212347.179656-1-mlevedahl@gmail.com>
git-gui's Makefile hardcodes the absolute Windows path of git-gui's libraries into git-gui, destroying the ability to package git-gui on one machine and distribute to others. The intent is to do this only if a non-Cygwin Tcl/Tk is installed, but the test for this is wrong with the unix/X11 Tcl/Tk shipped since 2012. Also, Cygwin does not support a non-Cygwin Tcl/Tk.
The Cygwin git maintainer disables this code, so this code is definitely not in use in the Cygwin distribution, and targets an untested / unsupportable configuration.
The simplest approach is to just delete the Cygwin specific code as stock Cygwin needs no special handling. Do so.
Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> --- Makefile | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile index a0d5a4b..3f80435 100644 --- a/Makefile +++ b/Makefile @@ -138,25 +138,10 @@ GITGUI_SCRIPT := $$0 GITGUI_RELATIVE := GITGUI_MACOSXAPP := -ifeq ($(uname_O),Cygwin) - GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"` - - # Is this a Cygwin Tcl/Tk binary? If so it knows how to do - # POSIX path translation just like cygpath does and we must - # keep libdir in POSIX format so Cygwin packages of git-gui - # work no matter where the user installs them. - # - ifeq ($(shell echo 'puts [file normalize /]' | '$(TCL_PATH_SQ)'),$(shell cygpath --mixed --absolute /)) - gg_libdir_sed_in := $(gg_libdir) - else - gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)") - endif -else - ifeq ($(exedir),$(gg_libdir)) - GITGUI_RELATIVE := 1 - endif - gg_libdir_sed_in := $(gg_libdir) +ifeq ($(exedir),$(gg_libdir)) + GITGUI_RELATIVE := 1 endif +gg_libdir_sed_in := $(gg_libdir) ifeq ($(uname_S),Darwin) ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y) GITGUI_MACOSXAPP := YesPlease
-- 2.41.0.99.19