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>
Mark Levedahl committed
Jan 17, 2008 at 22:50 UTC
a02855711310b553c610fe7ef634f4ceb25fe9f6
1 file changed
+3
-2
Makefile
+3
-2
@@ -110,7 +110,7 @@ TCLTK_PATH_SED = $(subst ','\'',$(subst \,\\,$(TCLTK_PATH)))
110
111
gg_libdir ?= $(sharedir)/git-gui/lib
112
libdir_SQ = $(subst ','\'',$(gg_libdir))
113
-libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir)))
113
+libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir_sed_in)))
114
exedir = $(dir $(gitexecdir))share/git-gui/lib
115
116
GITGUI_SCRIPT := $$0
@@ -119,11 +119,12 @@ GITGUI_MACOSXAPP :=
119
120
ifeq ($(uname_O),Cygwin)
121
GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"`
122
- gg_libdir := $(shell cygpath --windows --absolute "$(gg_libdir)")
122
+ gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)")
123
else
124
ifeq ($(exedir),$(gg_libdir))
125
GITGUI_RELATIVE := 1
126
endif
127
+ gg_libdir_sed_in := $(gg_libdir)
128
endif
129
ifeq ($(uname_S),Darwin)
130
ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)