From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 12 Feb 2007 20:37:50 +0000 (-0500)
Subject: git-gui: Allow gitexecdir, INSTALL to be set by the caller.
X-Git-Tag: gitgui-0.6.0~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=663e7cf81d970d8320147d4d58dce37aaebfb09b;p=git.git

git-gui: Allow gitexecdir, INSTALL to be set by the caller.

When used as a subproject within git.git our Makefile must honor
the gitexecdir which git.git's Makefile is passing down to us,
ensuring that we install our executables into the libexec chosen
by the end-user or packager.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/Makefile b/Makefile
index 8fade6912..f1668bbd1 100644
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,16 @@ ifndef SHELL_PATH
 	SHELL_PATH = /bin/sh
 endif
 
-gitexecdir := $(shell git --exec-path)
-INSTALL = install
+ifndef gitexecdir
+	gitexecdir := $(shell git --exec-path)
+endif
+
+ifndef INSTALL
+	INSTALL = install
+endif
 
 DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
-
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 
 $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh