Skip to content

Commit a028557

Browse files
mark987spearce
authored andcommitted
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 <[email protected]> Signed-off-by: Shawn O. Pearce <[email protected]>
1 parent a1f8f50 commit a028557

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ TCLTK_PATH_SED = $(subst ','\'',$(subst \,\\,$(TCLTK_PATH)))
110110

111111
gg_libdir ?= $(sharedir)/git-gui/lib
112112
libdir_SQ = $(subst ','\'',$(gg_libdir))
113-
libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir)))
113+
libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir_sed_in)))
114114
exedir = $(dir $(gitexecdir))share/git-gui/lib
115115

116116
GITGUI_SCRIPT := $$0
@@ -119,11 +119,12 @@ GITGUI_MACOSXAPP :=
119119

120120
ifeq ($(uname_O),Cygwin)
121121
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)")
123123
else
124124
ifeq ($(exedir),$(gg_libdir))
125125
GITGUI_RELATIVE := 1
126126
endif
127+
gg_libdir_sed_in := $(gg_libdir)
127128
endif
128129
ifeq ($(uname_S),Darwin)
129130
ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)

0 commit comments

Comments
 (0)