From 663e7cf81d970d8320147d4d58dce37aaebfb09b Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Mon, 12 Feb 2007 15:37:50 -0500 Subject: [PATCH] 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 --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8fade69127..f1668bbd18 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