aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-15 10:24:13 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-15 10:24:13 -0800
commit1f0335a63fede94308050a70a47ab7ee92c25d95 (patch)
tree1c0ef612ae2f0798571ecb323b534244ee90d476 /Makefile
parenta2055c28eefd1bc2bb4997276d809ee3d3436a50 (diff)
parent50e6af7daf88f42f146c9148df24f7824a1dffac (diff)
downloadgit-1f0335a63fede94308050a70a47ab7ee92c25d95.tar.gz
git-1f0335a63fede94308050a70a47ab7ee92c25d95.tar.xz
Merge branch 'js/hp-nonstop'
Finishing touches to port to HP NonStop continues. * js/hp-nonstop: fix 'make test' for HP NonStop
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 53a766e28..ea5c106bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1385,6 +1385,10 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
MKDIR_WO_TRAILING_SLASH = YesPlease
# RFE 10-120912-4693 submitted to HP NonStop development.
NO_SETITIMER = UnfortunatelyYes
+ SANE_TOOL_PATH=/usr/coreutils/bin:/usr/local/bin
+ SHELL_PATH=/usr/local/bin/bash
+ # as of H06.25/J06.14, we might better use this
+ #SHELL_PATH=/usr/coreutils/bin/bash
endif
ifneq (,$(findstring MINGW,$(uname_S)))
pathsep = ;