diff --git a/Build/Scripts/build_thirdparty_libs.sh b/Build/Scripts/build_thirdparty_libs.sh
old mode 100644
new mode 100755
diff --git a/Build/impi_intel_linux/make_fds.sh b/Build/impi_intel_linux/make_fds.sh
index 5e449d368eb..85cb4e002a8 100755
--- a/Build/impi_intel_linux/make_fds.sh
+++ b/Build/impi_intel_linux/make_fds.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
-ARG=$1
-
-source ../Scripts/set_intel_compiler.sh $ARG
 
 dir=`pwd`
 target=${dir##*/}
 
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+export SOURCE_INTEL_IFORT=1
+source ../Scripts/build_thirdparty_libs.sh "$@"
+
+# Build fds
 echo Building $target with Intel MPI and $INTEL_IFORT
 make -j4 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/impi_intel_linux_db/make_fds.sh b/Build/impi_intel_linux_db/make_fds.sh
index 0144295d470..85cb4e002a8 100755
--- a/Build/impi_intel_linux_db/make_fds.sh
+++ b/Build/impi_intel_linux_db/make_fds.sh
@@ -3,12 +3,11 @@
 dir=`pwd`
 target=${dir##*/}
 
-# Compile third-party libraries.
+# Compile third-party libraries
 export FDS_BUILD_TARGET=$target
 export SOURCE_INTEL_IFORT=1
 source ../Scripts/build_thirdparty_libs.sh "$@"
 
-
-# build fds
+# Build fds
 echo Building $target with Intel MPI and $INTEL_IFORT
-make VPATH="../../Source" -f ../makefile $target
+make -j4 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/impi_intel_linux_dv/make_fds.sh b/Build/impi_intel_linux_dv/make_fds.sh
index 5e449d368eb..85cb4e002a8 100755
--- a/Build/impi_intel_linux_dv/make_fds.sh
+++ b/Build/impi_intel_linux_dv/make_fds.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
-ARG=$1
-
-source ../Scripts/set_intel_compiler.sh $ARG
 
 dir=`pwd`
 target=${dir##*/}
 
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+export SOURCE_INTEL_IFORT=1
+source ../Scripts/build_thirdparty_libs.sh "$@"
+
+# Build fds
 echo Building $target with Intel MPI and $INTEL_IFORT
 make -j4 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/impi_intel_linux_openmp/make_fds.sh b/Build/impi_intel_linux_openmp/make_fds.sh
index 5e449d368eb..85cb4e002a8 100755
--- a/Build/impi_intel_linux_openmp/make_fds.sh
+++ b/Build/impi_intel_linux_openmp/make_fds.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
-ARG=$1
-
-source ../Scripts/set_intel_compiler.sh $ARG
 
 dir=`pwd`
 target=${dir##*/}
 
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+export SOURCE_INTEL_IFORT=1
+source ../Scripts/build_thirdparty_libs.sh "$@"
+
+# Build fds
 echo Building $target with Intel MPI and $INTEL_IFORT
 make -j4 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/impi_intel_linux_openmp_db/make_fds.sh b/Build/impi_intel_linux_openmp_db/make_fds.sh
index 5e449d368eb..02899312b4c 100755
--- a/Build/impi_intel_linux_openmp_db/make_fds.sh
+++ b/Build/impi_intel_linux_openmp_db/make_fds.sh
@@ -1,10 +1,14 @@
 #!/bin/bash
-ARG=$1
-
-source ../Scripts/set_intel_compiler.sh $ARG
 
 dir=`pwd`
 target=${dir##*/}
 
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+export SOURCE_INTEL_IFORT=1
+source ../Scripts/build_thirdparty_libs.sh "$@"
+
+# Build fds
 echo Building $target with Intel MPI and $INTEL_IFORT
 make -j4 VPATH="../../Source" -f ../makefile $target
+
diff --git a/Build/impi_intel_linux_openmp_dv/make_fds.sh b/Build/impi_intel_linux_openmp_dv/make_fds.sh
index 5e449d368eb..02899312b4c 100755
--- a/Build/impi_intel_linux_openmp_dv/make_fds.sh
+++ b/Build/impi_intel_linux_openmp_dv/make_fds.sh
@@ -1,10 +1,14 @@
 #!/bin/bash
-ARG=$1
-
-source ../Scripts/set_intel_compiler.sh $ARG
 
 dir=`pwd`
 target=${dir##*/}
 
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+export SOURCE_INTEL_IFORT=1
+source ../Scripts/build_thirdparty_libs.sh "$@"
+
+# Build fds
 echo Building $target with Intel MPI and $INTEL_IFORT
 make -j4 VPATH="../../Source" -f ../makefile $target
+
diff --git a/Build/ompi_gnu_linux/make_fds.sh b/Build/ompi_gnu_linux/make_fds.sh
index 885bf58554f..3f867e53a85 100755
--- a/Build/ompi_gnu_linux/make_fds.sh
+++ b/Build/ompi_gnu_linux/make_fds.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
+
 dir=`pwd`
 target=${dir##*/}
 
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+source ../Scripts/build_thirdparty_libs.sh "$@"
+
+# Builds fds
 echo Building $target
 make -j4 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/ompi_gnu_linux_db/make_fds.sh b/Build/ompi_gnu_linux_db/make_fds.sh
index c9efae70d4b..3f867e53a85 100755
--- a/Build/ompi_gnu_linux_db/make_fds.sh
+++ b/Build/ompi_gnu_linux_db/make_fds.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
+
 dir=`pwd`
 target=${dir##*/}
 
-# Compile third-party libraries.
+# Compile third-party libraries
 export FDS_BUILD_TARGET=$target
 source ../Scripts/build_thirdparty_libs.sh "$@"
 
+# Builds fds
 echo Building $target
 make -j4 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/ompi_gnu_linux_dv/make_fds.sh b/Build/ompi_gnu_linux_dv/make_fds.sh
index 885bf58554f..e6799fa3b03 100755
--- a/Build/ompi_gnu_linux_dv/make_fds.sh
+++ b/Build/ompi_gnu_linux_dv/make_fds.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
+
 dir=`pwd`
 target=${dir##*/}
 
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+source ../Scripts/build_thirdparty_libs.sh "$@"
+
+# Builds fds
 echo Building $target
-make -j4 VPATH="../../Source" -f ../makefile $target
+make -j4 VPATH="../../Source" -f ../makefile $target
\ No newline at end of file
diff --git a/Build/ompi_gnu_osx/make_fds.sh b/Build/ompi_gnu_osx/make_fds.sh
index 885bf58554f..8013c473584 100755
--- a/Build/ompi_gnu_osx/make_fds.sh
+++ b/Build/ompi_gnu_osx/make_fds.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
+
 dir=`pwd`
 target=${dir##*/}
 
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+source ../Scripts/build_thirdparty_libs.sh "$@"
+
+# Build fds
 echo Building $target
 make -j4 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/ompi_gnu_osx_db/make_fds.sh b/Build/ompi_gnu_osx_db/make_fds.sh
index c9efae70d4b..8013c473584 100755
--- a/Build/ompi_gnu_osx_db/make_fds.sh
+++ b/Build/ompi_gnu_osx_db/make_fds.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
+
 dir=`pwd`
 target=${dir##*/}
 
-# Compile third-party libraries.
+# Compile third-party libraries
 export FDS_BUILD_TARGET=$target
 source ../Scripts/build_thirdparty_libs.sh "$@"
 
+# Build fds
 echo Building $target
 make -j4 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/ompi_gnu_osx_dv/make_fds.sh b/Build/ompi_gnu_osx_dv/make_fds.sh
index 885bf58554f..8013c473584 100755
--- a/Build/ompi_gnu_osx_dv/make_fds.sh
+++ b/Build/ompi_gnu_osx_dv/make_fds.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
+
 dir=`pwd`
 target=${dir##*/}
 
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+source ../Scripts/build_thirdparty_libs.sh "$@"
+
+# Build fds
 echo Building $target
 make -j4 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/ompi_intel_linux/make_fds.sh b/Build/ompi_intel_linux/make_fds.sh
index 885bf58554f..4ae4f412a5f 100755
--- a/Build/ompi_intel_linux/make_fds.sh
+++ b/Build/ompi_intel_linux/make_fds.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
+
 dir=`pwd`
 target=${dir##*/}
 
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+source ../Scripts/build_thirdparty_libs.sh "$@"
+
+# Build fds
 echo Building $target
 make -j4 VPATH="../../Source" -f ../makefile $target
+
diff --git a/Build/ompi_intel_osx/make_fds.sh b/Build/ompi_intel_osx/make_fds.sh
index 0c83fe5dce3..8942acfcf7c 100755
--- a/Build/ompi_intel_osx/make_fds.sh
+++ b/Build/ompi_intel_osx/make_fds.sh
@@ -3,7 +3,10 @@
 dir=`pwd`
 target=${dir##*/}
 
-echo Building $target
-`ifort -v`
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+source ../Scripts/build_thirdparty_libs.sh "$@"
 
-make -j4 VPATH="../../Source" -f ../makefile $target
+# Build fds
+echo Building $target
+make -j4 VPATH="../../Source" -f ../makefile $target
\ No newline at end of file
diff --git a/Build/ompi_intel_osx_db/make_fds.sh b/Build/ompi_intel_osx_db/make_fds.sh
index 66a833df5da..8013c473584 100755
--- a/Build/ompi_intel_osx_db/make_fds.sh
+++ b/Build/ompi_intel_osx_db/make_fds.sh
@@ -3,11 +3,10 @@
 dir=`pwd`
 target=${dir##*/}
 
-# Compile third-party libraries.
+# Compile third-party libraries
 export FDS_BUILD_TARGET=$target
 source ../Scripts/build_thirdparty_libs.sh "$@"
 
+# Build fds
 echo Building $target
-`ifort -v`
-
 make -j4 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/ompi_intel_osx_dv/make_fds.sh b/Build/ompi_intel_osx_dv/make_fds.sh
index 0c83fe5dce3..8013c473584 100755
--- a/Build/ompi_intel_osx_dv/make_fds.sh
+++ b/Build/ompi_intel_osx_dv/make_fds.sh
@@ -3,7 +3,10 @@
 dir=`pwd`
 target=${dir##*/}
 
-echo Building $target
-`ifort -v`
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+source ../Scripts/build_thirdparty_libs.sh "$@"
 
+# Build fds
+echo Building $target
 make -j4 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/ompi_intel_osx_openmp/make_fds.sh b/Build/ompi_intel_osx_openmp/make_fds.sh
index 0c83fe5dce3..8013c473584 100755
--- a/Build/ompi_intel_osx_openmp/make_fds.sh
+++ b/Build/ompi_intel_osx_openmp/make_fds.sh
@@ -3,7 +3,10 @@
 dir=`pwd`
 target=${dir##*/}
 
-echo Building $target
-`ifort -v`
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+source ../Scripts/build_thirdparty_libs.sh "$@"
 
+# Build fds
+echo Building $target
 make -j4 VPATH="../../Source" -f ../makefile $target
diff --git a/Build/ompi_intel_osx_openmp_db/make_fds.sh b/Build/ompi_intel_osx_openmp_db/make_fds.sh
index 0c83fe5dce3..8942acfcf7c 100755
--- a/Build/ompi_intel_osx_openmp_db/make_fds.sh
+++ b/Build/ompi_intel_osx_openmp_db/make_fds.sh
@@ -3,7 +3,10 @@
 dir=`pwd`
 target=${dir##*/}
 
-echo Building $target
-`ifort -v`
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+source ../Scripts/build_thirdparty_libs.sh "$@"
 
-make -j4 VPATH="../../Source" -f ../makefile $target
+# Build fds
+echo Building $target
+make -j4 VPATH="../../Source" -f ../makefile $target
\ No newline at end of file
diff --git a/Build/ompi_intel_osx_openmp_dv/make_fds.sh b/Build/ompi_intel_osx_openmp_dv/make_fds.sh
index 0c83fe5dce3..8942acfcf7c 100755
--- a/Build/ompi_intel_osx_openmp_dv/make_fds.sh
+++ b/Build/ompi_intel_osx_openmp_dv/make_fds.sh
@@ -3,7 +3,10 @@
 dir=`pwd`
 target=${dir##*/}
 
-echo Building $target
-`ifort -v`
+# Compile third-party libraries
+export FDS_BUILD_TARGET=$target
+source ../Scripts/build_thirdparty_libs.sh "$@"
 
-make -j4 VPATH="../../Source" -f ../makefile $target
+# Build fds
+echo Building $target
+make -j4 VPATH="../../Source" -f ../makefile $target
\ No newline at end of file