Merge branch 'rs/bash-is-in-coreutils-on-nonstop'
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 02:18:43 +0000 (18:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 02:18:43 +0000 (18:18 -0800)
* rs/bash-is-in-coreutils-on-nonstop:
config.mak.uname: move location of bash on NonStop to CoreUtils

config.mak.uname
index 29ed39475f8fc5d00c172860e103b97871e51b1c..b37fa8424c88cae23abf02f8276e8b4f6ffef19a 100644 (file)
@@ -510,9 +510,7 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
        # 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
+       SHELL_PATH = /usr/coreutils/bin/bash
 endif
 ifneq (,$(findstring MINGW,$(uname_S)))
        pathsep = ;