diff --git a/install-cmake.sh b/install-cmake.sh
index cde80f803..dbcfc7f31 100755
--- a/install-cmake.sh
+++ b/install-cmake.sh
@@ -60,7 +60,7 @@ fi
 
 # The default build directory.
 #------------------------------------------------------------------------------
-BUILD_DIR="build-libbitcoin-node"
+BUILD_SRC_DIR="build-libbitcoin-node"
 
 PRESUMED_CI_PROJECT_PATH=$(pwd)
 
@@ -162,13 +162,13 @@ make_jobs()
     shift 1
 
     VERBOSITY=""
-    if [[ DISPLAY_VERBOSE ]]; then
+    if [[ $DISPLAY_VERBOSE ]]; then
         VERBOSITY="VERBOSE=1"
     fi
 
     SEQUENTIAL=1
     # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
-    if [[ $JOBS > $SEQUENTIAL ]]; then
+    if [[ $JOBS -gt $SEQUENTIAL ]]; then
         make -j"$JOBS" "$@" $VERBOSITY
     else
         make "$@" $VERBOSITY
@@ -272,7 +272,7 @@ parse_command_line_options()
             (--build-secp256k1)                        BUILD_SECP256K1="yes";;
 
             # Unique script options.
-            (--build-dir=*)         BUILD_DIR="${OPTION#*=}";;
+            (--build-dir=*)         BUILD_SRC_DIR="${OPTION#*=}";;
 
             # Handle ndebug declarations due to disabled argument passthrough
             (--enable-ndebug)       ENABLE_NDEBUG="yes";;
@@ -326,11 +326,6 @@ set_os_specific_compiler_settings()
     else # Linux
         STDLIB="stdc++"
     fi
-
-    if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
-        CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
-        CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
-    fi
 }
 
 link_to_standard_library()
@@ -481,7 +476,7 @@ display_configuration()
     display_message "BUILD_BOOST           : $BUILD_BOOST"
     display_message "BUILD_SECP256K1       : $BUILD_SECP256K1"
     display_message "BOOST_ROOT            : $BOOST_ROOT"
-    display_message "BUILD_DIR                      : $BUILD_DIR"
+    display_message "BUILD_SRC_DIR                  : $BUILD_SRC_DIR"
     display_message "CUMULATIVE_FILTERED_ARGS       : $CUMULATIVE_FILTERED_ARGS"
     display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
     display_message "PREFIX                : $PREFIX"
@@ -1073,10 +1068,10 @@ BITCOIN_NODE_OPTIONS=(
 display_configuration
 
 if [[ ! ($CI == true) ]]; then
-    create_directory "$BUILD_DIR"
-    push_directory "$BUILD_DIR"
+    create_directory "$BUILD_SRC_DIR"
+    push_directory "$BUILD_SRC_DIR"
 else
-    push_directory "$BUILD_DIR"
+    push_directory "$BUILD_SRC_DIR"
 fi
 
 initialize_git
diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh
index a0cc4b63b..060f97df6 100755
--- a/install-cmakepresets.sh
+++ b/install-cmakepresets.sh
@@ -66,7 +66,7 @@ fi
 
 # The default build directory.
 #------------------------------------------------------------------------------
-BUILD_DIR="build-libbitcoin-node"
+BUILD_SRC_DIR="build-libbitcoin-node"
 
 PRESUMED_CI_PROJECT_PATH=$(pwd)
 
@@ -168,13 +168,13 @@ make_jobs()
     shift 1
 
     VERBOSITY=""
-    if [[ DISPLAY_VERBOSE ]]; then
+    if [[ $DISPLAY_VERBOSE ]]; then
         VERBOSITY="VERBOSE=1"
     fi
 
     SEQUENTIAL=1
     # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
-    if [[ $JOBS > $SEQUENTIAL ]]; then
+    if [[ $JOBS -gt $SEQUENTIAL ]]; then
         make -j"$JOBS" "$@" $VERBOSITY
     else
         make "$@" $VERBOSITY
@@ -279,7 +279,7 @@ parse_command_line_options()
             (--build-secp256k1)                        BUILD_SECP256K1="yes";;
 
             # Unique script options.
-            (--build-dir=*)         BUILD_DIR="${OPTION#*=}";;
+            (--build-dir=*)         BUILD_SRC_DIR="${OPTION#*=}";;
             (--preset=*)            PRESET_ID="${OPTION#*=}";;
 
             # Handle ndebug declarations due to disabled argument passthrough
@@ -334,11 +334,6 @@ set_os_specific_compiler_settings()
     else # Linux
         STDLIB="stdc++"
     fi
-
-    if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
-        CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
-        CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
-    fi
 }
 
 link_to_standard_library()
@@ -520,7 +515,7 @@ display_configuration()
     display_message "BUILD_BOOST           : $BUILD_BOOST"
     display_message "BUILD_SECP256K1       : $BUILD_SECP256K1"
     display_message "BOOST_ROOT            : $BOOST_ROOT"
-    display_message "BUILD_DIR                      : $BUILD_DIR"
+    display_message "BUILD_SRC_DIR                  : $BUILD_SRC_DIR"
     display_message "PRESET_ID                      : $PRESET_ID"
     display_message "CUMULATIVE_FILTERED_ARGS       : $CUMULATIVE_FILTERED_ARGS"
     display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
@@ -1121,10 +1116,10 @@ BITCOIN_NODE_OPTIONS=(
 display_configuration
 
 if [[ ! ($CI == true) ]]; then
-    create_directory "$BUILD_DIR"
-    push_directory "$BUILD_DIR"
+    create_directory "$BUILD_SRC_DIR"
+    push_directory "$BUILD_SRC_DIR"
 else
-    push_directory "$BUILD_DIR"
+    push_directory "$BUILD_SRC_DIR"
 fi
 
 initialize_git
diff --git a/install.sh b/install.sh
index 55284cfa7..e1bc1ca5b 100755
--- a/install.sh
+++ b/install.sh
@@ -60,7 +60,7 @@ fi
 
 # The default build directory.
 #------------------------------------------------------------------------------
-BUILD_DIR="build-libbitcoin-node"
+BUILD_SRC_DIR="build-libbitcoin-node"
 
 PRESUMED_CI_PROJECT_PATH=$(pwd)
 
@@ -162,13 +162,13 @@ make_jobs()
     shift 1
 
     VERBOSITY=""
-    if [[ DISPLAY_VERBOSE ]]; then
+    if [[ $DISPLAY_VERBOSE ]]; then
         VERBOSITY="VERBOSE=1"
     fi
 
     SEQUENTIAL=1
     # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
-    if [[ $JOBS > $SEQUENTIAL ]]; then
+    if [[ $JOBS -gt $SEQUENTIAL ]]; then
         make -j"$JOBS" "$@" $VERBOSITY
     else
         make "$@" $VERBOSITY
@@ -272,7 +272,7 @@ parse_command_line_options()
             (--build-secp256k1)                        BUILD_SECP256K1="yes";;
 
             # Unique script options.
-            (--build-dir=*)    BUILD_DIR="${OPTION#*=}";;
+            (--build-dir=*)    BUILD_SRC_DIR="${OPTION#*=}";;
         esac
     done
 }
@@ -321,11 +321,6 @@ set_os_specific_compiler_settings()
     else # Linux
         STDLIB="stdc++"
     fi
-
-    if [[ ($OS == Darwin) && ($CC == clang*) ]]; then
-        CFLAGS="${CFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
-        CXXFLAGS="${CXXFLAGS} -DBOOST_NO_CXX98_FUNCTION_BASE"
-    fi
 }
 
 link_to_standard_library()
@@ -426,7 +421,7 @@ display_configuration()
     display_message "BUILD_BOOST           : $BUILD_BOOST"
     display_message "BUILD_SECP256K1       : $BUILD_SECP256K1"
     display_message "BOOST_ROOT            : $BOOST_ROOT"
-    display_message "BUILD_DIR             : $BUILD_DIR"
+    display_message "BUILD_SRC_DIR          : $BUILD_SRC_DIR"
     display_message "PREFIX                : $PREFIX"
     display_message "DISABLE_SHARED        : $DISABLE_SHARED"
     display_message "DISABLE_STATIC        : $DISABLE_STATIC"
@@ -947,10 +942,10 @@ BITCOIN_NODE_OPTIONS=(
 display_configuration
 
 if [[ ! ($CI == true) ]]; then
-    create_directory "$BUILD_DIR"
-    push_directory "$BUILD_DIR"
+    create_directory "$BUILD_SRC_DIR"
+    push_directory "$BUILD_SRC_DIR"
 else
-    push_directory "$BUILD_DIR"
+    push_directory "$BUILD_SRC_DIR"
 fi
 
 initialize_git