summaryrefslogtreecommitdiff
path: root/git-gui/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-01-20 16:58:38 -0800
committerJunio C Hamano <gitster@pobox.com>2008-01-20 16:58:38 -0800
commit105c21df14531bf2fd39e05b4c3a9aa31349da06 (patch)
tree272f75883898897f17c337e247b70043e5efdaaf /git-gui/Makefile
parenta41acc63badf20cbb22cca61039dca9309deaa19 (diff)
parenta02855711310b553c610fe7ef634f4ceb25fe9f6 (diff)
downloadgit-105c21df14531bf2fd39e05b4c3a9aa31349da06.tar.gz
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: Makefile - Handle $DESTDIR on Cygwin git-gui: add french glossary: glossary/fr.po git-gui: Refresh file status description after hunk application git-gui: Allow 'Create New Repository' on existing directories git-gui: Initial french translation git-gui: Improve German translation. git-gui: Updated Swedish translation after mailing list review. git-gui: Fix broken revert confirmation. git-gui: Update German translation git-gui: Update glossary: add term "hunk"
Diffstat (limited to 'git-gui/Makefile')
-rw-r--r--git-gui/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile
index c109eab137..1baf4b0861 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -110,7 +110,7 @@ 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
@@ -119,11 +119,12 @@ GITGUI_MACOSXAPP :=
ifeq ($(uname_O),Cygwin)
GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"`
- 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)