aboutsummaryrefslogtreecommitdiff
path: root/git-gui/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-01-04 22:03:42 -0800
committerJunio C Hamano <gitster@pobox.com>2008-01-04 22:03:42 -0800
commit144126abf99f2eac48e63b7ea85a8f3f99f814db (patch)
treecde92eb4fca39d059a0a370ed7790af53bd9a839 /git-gui/Makefile
parentcf9d58e4f388dc173b86143fbfe0eac114e3ed2f (diff)
parenta6d5888fa1bb24ef34ce36f0e684d13a58eba908 (diff)
downloadgit-144126abf99f2eac48e63b7ea85a8f3f99f814db.tar.gz
git-144126abf99f2eac48e63b7ea85a8f3f99f814db.tar.xz
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: Make commit log messages end with a newline Added Swedish translation. git-gui: Unconditionally use absolute paths with Cygwin git-gui: Handle file mode changes (644->755) in diff viewer git-gui: Move frequently used commands to the top of the context menu.
Diffstat (limited to 'git-gui/Makefile')
-rw-r--r--git-gui/Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile
index 26ac4b6bb..c109eab13 100644
--- 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)