summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMark Levedahl <mdl123@verizon.net>2007-12-13 14:02:26 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-12-14 06:51:37 (GMT)
commit9fe98116a2c7231503e7f5156417c1af84d4a59e (patch)
tree30e57055c78c9699cd89a807184e091fdd2181a8 /Makefile
parenta4750dd26671427009cc2c7a6a303f7ad8c39e8a (diff)
downloadgit-9fe98116a2c7231503e7f5156417c1af84d4a59e.zip
git-9fe98116a2c7231503e7f5156417c1af84d4a59e.tar.gz
git-9fe98116a2c7231503e7f5156417c1af84d4a59e.tar.bz2
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 26ac4b6..c109eab 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)