aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Levedahl <mdl123@verizon.net>2008-01-17 22:50:23 -0500
committerShawn O. Pearce <spearce@spearce.org>2008-01-17 22:58:24 -0500
commita02855711310b553c610fe7ef634f4ceb25fe9f6 (patch)
tree19408e3c23ab9ca15c4b7e1fd05f73892773edd3
parenta1f8f5043cb791aaa7d4c08dc779525551612da0 (diff)
downloadgit-a02855711310b553c610fe7ef634f4ceb25fe9f6.tar.gz
git-a02855711310b553c610fe7ef634f4ceb25fe9f6.tar.xz
git-gui: Makefile - Handle $DESTDIR on Cygwin
gg_libdir is converted to an absolute Windows path on Cygwin, but a later step attempts to prefix $DESTDIR to install to a staging directory. Explicitly separate the uses of gg_libdir for these two purposes so installation to $DESTDIR will work. Signed-off-by: Mark Levedahl <mdl123@verizon.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c109eab13..1baf4b086 100644
--- a/Makefile
+++ b/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)