diff --git a/install-cmake.sh b/install-cmake.sh
index 81cd147..cfa3828 100755
--- a/install-cmake.sh
+++ b/install-cmake.sh
@@ -59,7 +59,7 @@ fi
 
 # The default build directory.
 #------------------------------------------------------------------------------
-BUILD_DIR="build-libbitcoin-protocol"
+BUILD_SRC_DIR="build-libbitcoin-protocol"
 
 PRESUMED_CI_PROJECT_PATH=$(pwd)
 
@@ -166,13 +166,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
@@ -278,7 +278,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";;
@@ -332,11 +332,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()
@@ -488,7 +483,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"
@@ -1070,10 +1065,10 @@ BITCOIN_PROTOCOL_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 2f176cd..e4f5ebf 100755
--- a/install-cmakepresets.sh
+++ b/install-cmakepresets.sh
@@ -65,7 +65,7 @@ fi
 
 # The default build directory.
 #------------------------------------------------------------------------------
-BUILD_DIR="build-libbitcoin-protocol"
+BUILD_SRC_DIR="build-libbitcoin-protocol"
 
 PRESUMED_CI_PROJECT_PATH=$(pwd)
 
@@ -172,13 +172,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
@@ -285,7 +285,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
@@ -340,11 +340,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()
@@ -523,7 +518,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"
@@ -1112,10 +1107,10 @@ BITCOIN_PROTOCOL_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 1e10e8b..ea4d2c0 100755
--- a/install.sh
+++ b/install.sh
@@ -59,7 +59,7 @@ fi
 
 # The default build directory.
 #------------------------------------------------------------------------------
-BUILD_DIR="build-libbitcoin-protocol"
+BUILD_SRC_DIR="build-libbitcoin-protocol"
 
 PRESUMED_CI_PROJECT_PATH=$(pwd)
 
@@ -166,13 +166,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
@@ -278,7 +278,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
 }
@@ -327,11 +327,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()
@@ -433,7 +428,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"
@@ -944,10 +939,10 @@ BITCOIN_PROTOCOL_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