Library function to check for unmerged index entries

diff --git a/git-gui/Makefile b/git-gui/Makefile
index 26ac4b6bb0e974130ae84f4e35e1464f8b08e202..1baf4b086131a10ab7e33529274ebd15100f375e 100644 (file)
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -110,22 +110,21 @@ TCLTK_PATH_SED = $(subst ','\'',$(subst \,\\,$(TCLTK_PATH)))
 
 gg_libdir ?= $(sharedir)/git-gui/lib
 libdir_SQ  = $(subst ','\'',$(gg_libdir))
-libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir)))
+libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir_sed_in)))
 exedir     = $(dir $(gitexecdir))share/git-gui/lib
 
 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_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)")
+else
+       ifeq ($(exedir),$(gg_libdir))
+               GITGUI_RELATIVE := 1
        endif
+       gg_libdir_sed_in := $(gg_libdir)
 endif
 ifeq ($(uname_S),Darwin)
        ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)