From: Mark Levedahl <mdl123@verizon.net>
Date: Thu, 13 Dec 2007 14:02:26 +0000 (-0500)
Subject: git-gui: Unconditionally use absolute paths with Cygwin
X-Git-Tag: gitgui-0.9.1~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9fe98116a2c7231503e7f5156417c1af84d4a59e;p=git.git

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>
---

diff --git a/Makefile b/Makefile
index 26ac4b6bb..c109eab13 100644
--- a/Makefile
+++ b/Makefile
@@ -117,14 +117,12 @@ GITGUI_SCRIPT   := $$0
 GITGUI_RELATIVE :=
 GITGUI_MACOSXAPP :=
 
-ifeq ($(exedir),$(gg_libdir))
-	GITGUI_RELATIVE := 1
-endif
-
 ifeq ($(uname_O),Cygwin)
 	GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"`
-	ifeq ($(GITGUI_RELATIVE),)
-		gg_libdir := $(shell cygpath --windows --absolute "$(gg_libdir)")
+	gg_libdir := $(shell cygpath --windows --absolute "$(gg_libdir)")
+else
+	ifeq ($(exedir),$(gg_libdir))
+		GITGUI_RELATIVE := 1
 	endif
 endif
 ifeq ($(uname_S),Darwin)