From: Mark Levedahl Date: Fri, 18 Jan 2008 03:50:23 GMT Subject: [PATCH] git-gui/Makefile - Handle $DESTDIR on Cygwin Message-ID: <1200628223-2280-1-git-send-email-mlevedahl@gmail.com> In-Reply-To: <20080116064012.GO24004@spearce.org> From: Mark Levedahl 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 --- git-gui built with this passed tests on cygwin + tcl/tk 8.5, cygwin + normal tcl/tk, and linux. DESTDIR also works on cygwin, so I would suggest this rather than the previous patch. git-gui/Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/git-gui/Makefile b/git-gui/Makefile index c109eab..1baf4b0 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) -- 1.5.4.rc3.26.gf961e