Skip to content

Commit ae49066

Browse files
mark987prati0100
authored andcommitted
git gui Makefile - remove Cygwin modifications
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. The simplest fix is to just delete the Cygwin specific code, allowing the Makefile to work out of the box on Cygwin. Do so. Signed-off-by: Mark Levedahl <[email protected]> Acked-by: Johannes Schindelin <[email protected]> Signed-off-by: Pratyush Yadav <[email protected]>
1 parent a5005de commit ae49066

File tree

1 file changed

+3
-18
lines changed

1 file changed

+3
-18
lines changed

Makefile

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -138,25 +138,10 @@ GITGUI_SCRIPT := $$0
138138
GITGUI_RELATIVE :=
139139
GITGUI_MACOSXAPP :=
140140

141-
ifeq ($(uname_O),Cygwin)
142-
GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"`
143-
144-
# Is this a Cygwin Tcl/Tk binary? If so it knows how to do
145-
# POSIX path translation just like cygpath does and we must
146-
# keep libdir in POSIX format so Cygwin packages of git-gui
147-
# work no matter where the user installs them.
148-
#
149-
ifeq ($(shell echo 'puts [file normalize /]' | '$(TCL_PATH_SQ)'),$(shell cygpath --mixed --absolute /))
150-
gg_libdir_sed_in := $(gg_libdir)
151-
else
152-
gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)")
153-
endif
154-
else
155-
ifeq ($(exedir),$(gg_libdir))
156-
GITGUI_RELATIVE := 1
157-
endif
158-
gg_libdir_sed_in := $(gg_libdir)
141+
ifeq ($(exedir),$(gg_libdir))
142+
GITGUI_RELATIVE := 1
159143
endif
144+
gg_libdir_sed_in := $(gg_libdir)
160145
ifeq ($(uname_S),Darwin)
161146
ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)
162147
GITGUI_MACOSXAPP := YesPlease

0 commit comments

Comments
 (0)