Skip to content

Commit

Permalink
git-gui: Allow gitexecdir, INSTALL to be set by the caller.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
spearce committed Feb 12, 2007
1 parent 0960f7d commit 663e7cf
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions Makefile
Expand Up @@ -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
Expand Down

0 comments on commit 663e7cf

Please sign in to comment.