aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-02-12 15:37:50 -0500
committerShawn O. Pearce <spearce@spearce.org>2007-02-12 15:37:50 -0500
commit663e7cf81d970d8320147d4d58dce37aaebfb09b (patch)
tree4d1d31b34aa797ebc4ee866c2769d7c8d27492e8
parent0960f7d6db89fa8418486cd088759e54dd51d54e (diff)
downloadgit-663e7cf81d970d8320147d4d58dce37aaebfb09b.tar.gz
git-663e7cf81d970d8320147d4d58dce37aaebfb09b.tar.xz
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>
-rw-r--r--Makefile10
1 files changed, 7 insertions, 3 deletions
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