diff --git a/makeCGAL b/makeCGAL
index 4c3ff3e7..0fbd2c83 100755
--- a/makeCGAL
+++ b/makeCGAL
@@ -258,13 +258,13 @@ CMAKE_OPTIONS
         echo "    ThirdParty     : gmp/mpfr"
         configGmpMpfr=$(cat <<CMAKE_OPTIONS
  -DGMP_INCLUDE_DIR=$GMP_ARCH_PATH/include
- -DGMP_LIBRARIES_DIR=$GMP_ARCH_PATH/lib
- -DGMP_LIBRARIES=$GMP_ARCH_PATH/lib/libgmp.so
+ -DGMP_LIBRARIES_DIR=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+ -DGMP_LIBRARIES=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libgmp.so
  -DGMPXX_INCLUDE_DIR=$GMP_ARCH_PATH/include
- -DGMPXX_LIBRARIES=$GMP_ARCH_PATH/lib/libgmpxx.so
+ -DGMPXX_LIBRARIES=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libgmpxx.so
  -DMPFR_INCLUDE_DIR=$MPFR_ARCH_PATH/include
- -DMPFR_LIBRARIES_DIR=$MPFR_ARCH_PATH/lib
- -DMPFR_LIBRARIES=$MPFR_ARCH_PATH/lib/libmpfr.so
+ -DMPFR_LIBRARIES_DIR=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+ -DMPFR_LIBRARIES=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpfr.so
 CMAKE_OPTIONS
 )
     else
@@ -276,6 +276,7 @@ CMAKE_OPTIONS
     cmake \
         -DCMAKE_INSTALL_PREFIX=$CGAL_ARCH_PATH \
         -DCMAKE_BUILD_TYPE=Release \
+        -DWITH_CGAL_Qt5=OFF \
         $configBoost $configGmpMpfr \
         $CGAL_SOURCE_DIR \
     && make -j $WM_NCOMPPROCS \
diff --git a/makeGcc b/makeGcc
index 0473567d..c455ce18 100755
--- a/makeGcc
+++ b/makeGcc
@@ -158,6 +158,7 @@ else
     set -x
     $sourceDIR/configure ABI=$ABI \
         --prefix=$GMP_ARCH_PATH \
+        --libdir=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
         --enable-cxx \
     && make -j $WM_NCOMPPROCS \
     && make install \
@@ -194,7 +195,9 @@ else
     set -x
     $sourceDIR/configure ABI=$ABI \
        --prefix=$MPFR_ARCH_PATH \
-       --with-gmp=$GMP_ARCH_PATH \
+       --libdir=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
+       --with-gmp-include=$GMP_ARCH_PATH/include \
+       --with-gmp-lib=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
     && make -j $WM_NCOMPPROCS \
     && make install \
     && echo "Built: $mpfrPACKAGE"
@@ -230,8 +233,11 @@ else
     set -x
     $sourceDIR/configure ABI=$ABI \
         --prefix=$MPC_ARCH_PATH \
-        --with-gmp=$GMP_ARCH_PATH \
-        --with-mpfr=$MPFR_ARCH_PATH \
+        --libdir=$MPC_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
+        --with-gmp-include=$GMP_ARCH_PATH/include \
+        --with-gmp-lib=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
+        --with-mpfr-include=$MPFR_ARCH_PATH/include \
+        --with-mpfr-lib=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
     && make -j $WM_NCOMPPROCS \
     && make install \
     && echo "Built: $mpcPACKAGE"
@@ -274,9 +280,12 @@ else
     set -x
     $sourceDIR/configure \
         --prefix=$GCC_ARCH_PATH \
-        --with-gmp=$GMP_ARCH_PATH \
-        --with-mpfr=$MPFR_ARCH_PATH \
-        --with-mpc=$MPC_ARCH_PATH \
+        --with-gmp-include=$GMP_ARCH_PATH/include \
+        --with-gmp-lib=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
+        --with-mpfr-include=$MPFR_ARCH_PATH/include \
+        --with-mpfr-lib=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
+        --with-mpc-include=$MPC_ARCH_PATH/include \
+        --with-mpc-lib=$MPC_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
         --with-pkgversion=OpenFOAM \
         --enable-languages=c,c++ \
         --enable-__cxa_atexit \