summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-03 12:28:40 -0700
committerJunio C Hamano <gitster@pobox.com>2010-04-03 12:28:40 -0700
commit0cb050abc2e7f05894f9f79d5330ce4559653af6 (patch)
treeef2ead44c562b088c1d18b2dbdde880f5a78ffc9 /Makefile
parent59d1e01d69865cb2238e01102c6987e4e1d71a32 (diff)
parent100e762a60a691a4978434f1cd5532e19cad39fc (diff)
downloadgit-0cb050abc2e7f05894f9f79d5330ce4559653af6.tar.gz
Merge branch 'bw/template-tool-buildconfig'
* bw/template-tool-buildconfig: Modernize git calling conventions in hook templates Make templates honour SHELL_PATH and PERL_PATH
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 140d19e7d0..a7f251683f 100644
--- a/Makefile
+++ b/Makefile
@@ -1480,7 +1480,7 @@ endif
ifndef NO_PYTHON
$(QUIET_SUBDIR0)git_remote_helpers $(QUIET_SUBDIR1) PYTHON_PATH='$(PYTHON_PATH_SQ)' prefix='$(prefix_SQ)' all
endif
- $(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1)
+ $(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) SHELL_PATH='$(SHELL_PATH_SQ)' PERL_PATH='$(PERL_PATH_SQ)'
please_set_SHELL_PATH_to_a_more_modern_shell:
@$$(:)