Merge git://repo.or.cz/git-gui

[thirdparty/git.git] / git-gui / Makefile

diff --git a/git-gui/Makefile b/git-gui/Makefile
index 26ac4b6bb0e974130ae84f4e35e1464f8b08e202..c109eab1378b99943baa40bc5e36f0b526c8201e 100644 (file)
--- a/git-gui/Makefile
+++ b/git-gui/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)