Merge branch 'mh/alt-odb-string-list-cleanup'

diff --git a/Makefile b/Makefile
index 53a766e283652d3f0e4602065ec73ea7e675836c..ea5c106bb293b4068bdcdfe434fd60f8e76d70bc 100644 (file)
--- 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 = ;