summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0960f7d)
raw | patch | inline | side by side (parent: 0960f7d)
author | Shawn O. Pearce <spearce@spearce.org> | |
Mon, 12 Feb 2007 20:37:50 +0000 (15:37 -0500) | ||
committer | Shawn O. Pearce <spearce@spearce.org> | |
Mon, 12 Feb 2007 20:37:50 +0000 (15:37 -0500) |
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>
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>
Makefile | patch | blob | history |
diff --git a/Makefile b/Makefile
index 8fade69127611ba9a6e38bed65b861379ac7dcce..f1668bbd18b26d11e8272f49ef20d90c8b8f7f93 100644 (file)
--- a/Makefile
+++ b/Makefile
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