From ade2a2dba35b2ee97e7a46bbc57a9bd1e3b24348 Mon Sep 17 00:00:00 2001 From: Mike Pape Date: Wed, 12 Sep 2007 11:46:39 -0400 Subject: [PATCH] git-gui: Correct error of not finding /share/git-gui/lib/tclIndex. Where the Makefile tests for Cygwin, it also needs to test for MINGW. Signed-off-by: Mike Pape --- git-gui/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-gui/Makefile b/git-gui/Makefile index 1bac6fed46..d8c5e65370 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -8,6 +8,7 @@ GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE -include GIT-VERSION-FILE uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') SCRIPT_SH = git-gui.sh GITGUI_BUILT_INS = git-citool @@ -86,7 +87,8 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh $(QUIET_GEN)rm -f $@ $@+ && \ GITGUI_RELATIVE= && \ if test '$(exedir_SQ)' = '$(libdir_SQ)'; then \ - if test "$(uname_O)" = Cygwin; \ + if test "$(uname_O)" = Cygwin \ + -o "$(findstring MINGW,$(uname_S))" = MINGW; \ then GITGUI_RELATIVE= ; \ else GITGUI_RELATIVE=1; \ fi; \