@matheusbsbs / matheus-bagliano / commits / 9fe98116a2
Fork 0

git-gui: Unconditionally use absolute paths with Cygwin

The mapping of Windows vs Cygwin/Posix paths is arbitrary and not knowable from the Posix side, so logic to determine whether to use relative paths to locate the git-gui library just does not work on Cygwin. Fix this to unconditionally use absolute path on Cygwin. (This fixes a regression from 1.5.4). Signed-off-by: Mark Levedahl <mdl123@verizon.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Mark Levedahl committed Dec 13, 2007 at 09:02 UTC 9fe98116a2c7231503e7f5156417c1af84d4a59e
1 file changed +4 -6
Makefile
+4 -6
@@ -117,14 +117,12 @@ GITGUI_SCRIPT := $$0
117 GITGUI_RELATIVE :=
118 GITGUI_MACOSXAPP :=
119
120 -ifeq ($(exedir),$(gg_libdir))
121 - GITGUI_RELATIVE := 1
122 -endif
123 -
120 ifeq ($(uname_O),Cygwin)
121 GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"`
126 - ifeq ($(GITGUI_RELATIVE),)
127 - gg_libdir := $(shell cygpath --windows --absolute "$(gg_libdir)")
122 + gg_libdir := $(shell cygpath --windows --absolute "$(gg_libdir)")
123 +else
124 + ifeq ($(exedir),$(gg_libdir))
125 + GITGUI_RELATIVE := 1
126 endif
127 endif
128 ifeq ($(uname_S),Darwin)