From b67c87012f2bd92270fd070b72cba0a5e7cdd28d Mon Sep 17 00:00:00 2001
From: Alexander Grund <alexander.grund@tu-dresden.de>
Date: Tue, 7 Feb 2023 17:10:45 +0100
Subject: [PATCH] Make ECs consistent

---
 .../easyconfigs/c/CGAL/CGAL-4.11-foss-2017b-Python-2.7.14.eb   | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.11-foss-2017b-Python-3.6.3.eb    | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.11-intel-2017a-Python-2.7.13.eb  | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.11-intel-2017b-Python-2.7.14.eb  | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.11-intel-2017b-Python-3.6.3.eb   | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018a-Python-2.7.14.eb | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018a-Python-3.6.4.eb  | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018b-Python-2.7.15.eb | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018b-Python-3.6.6.eb  | 2 +-
 .../c/CGAL/CGAL-4.11.1-intel-2018a-Python-2.7.14.eb            | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.14-foss-2019a-Python-3.7.2.eb    | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.14-intel-2019a-Python-3.7.2.eb   | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.14.1-foss-2019b-Python-3.7.4.eb  | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.14.1-intel-2019b-Python-3.7.4.eb | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.14.3-gompi-2020a-Python-3.8.2.eb | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.8-foss-2016a-Python-2.7.11.eb    | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.8-intel-2016a-Python-2.7.11.eb   | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.8.1-foss-2016b-Python-2.7.12.eb  | 2 +-
 easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-foss-2016b.eb          | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b-Python-2.7.12.eb | 2 +-
 easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b.eb         | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.9-intel-2016b-Python-2.7.12.eb   | 2 +-
 .../easyconfigs/c/CGAL/CGAL-4.9-intel-2017a-Python-2.7.13.eb   | 2 +-
 easybuild/easyconfigs/g/GDAL/GDAL-2.4.4-foss-2021b.eb          | 2 +-
 easybuild/easyconfigs/g/GDAL/GDAL-2.4.4-intel-2021b.eb         | 2 +-
 easybuild/easyconfigs/m/mosdepth/mosdepth-0.2.3-intel-2018a.eb | 3 ++-
 easybuild/easyconfigs/m/mosdepth/mosdepth-0.2.4-foss-2018b.eb  | 3 ++-
 .../s/SciPy-bundle/SciPy-bundle-2021.05-gomkl-2021a.eb         | 2 +-
 easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-10.2.0.eb      | 2 +-
 easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-10.3.0.eb      | 2 +-
 .../v/vcflib/vcflib-1.0.2-GCC-9.3.0-Python-3.8.2.eb            | 2 +-
 31 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.11-foss-2017b-Python-2.7.14.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.11-foss-2017b-Python-2.7.14.eb
index ef8c14a24e0..d033267aef3 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.11-foss-2017b-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.11-foss-2017b-Python-2.7.14.eb
@@ -28,7 +28,7 @@ builddependencies = [
     ('Eigen', '3.3.4', '', SYSTEM),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.11-foss-2017b-Python-3.6.3.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.11-foss-2017b-Python-3.6.3.eb
index 84989615633..be3206d85d4 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.11-foss-2017b-Python-3.6.3.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.11-foss-2017b-Python-3.6.3.eb
@@ -28,7 +28,7 @@ builddependencies = [
     ('Eigen', '3.3.4', '', SYSTEM),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.11-intel-2017a-Python-2.7.13.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.11-intel-2017a-Python-2.7.13.eb
index a954bcd3a8d..4d0b14dfd49 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.11-intel-2017a-Python-2.7.13.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.11-intel-2017a-Python-2.7.13.eb
@@ -28,7 +28,7 @@ builddependencies = [
     ('Eigen', '3.3.4', '', SYSTEM),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.11-intel-2017b-Python-2.7.14.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.11-intel-2017b-Python-2.7.14.eb
index 6e34c64e2f4..8ff6898f1ef 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.11-intel-2017b-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.11-intel-2017b-Python-2.7.14.eb
@@ -28,7 +28,7 @@ builddependencies = [
     ('Eigen', '3.3.4', '', SYSTEM),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.11-intel-2017b-Python-3.6.3.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.11-intel-2017b-Python-3.6.3.eb
index a1da6f58d7d..36172cf0ebf 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.11-intel-2017b-Python-3.6.3.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.11-intel-2017b-Python-3.6.3.eb
@@ -28,7 +28,7 @@ builddependencies = [
     ('Eigen', '3.3.4', '', SYSTEM),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018a-Python-2.7.14.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018a-Python-2.7.14.eb
index 41f7ebd36a8..a55803f816e 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018a-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018a-Python-2.7.14.eb
@@ -28,7 +28,7 @@ builddependencies = [
     ('Eigen', '3.3.4', '', SYSTEM),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018a-Python-3.6.4.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018a-Python-3.6.4.eb
index 9946b69f647..ff0938352bb 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018a-Python-3.6.4.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018a-Python-3.6.4.eb
@@ -28,7 +28,7 @@ builddependencies = [
     ('Eigen', '3.3.4', '', SYSTEM),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018b-Python-2.7.15.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018b-Python-2.7.15.eb
index 97c6dac0f01..180cab534a2 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018b-Python-2.7.15.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018b-Python-2.7.15.eb
@@ -28,7 +28,7 @@ builddependencies = [
     ('Eigen', '3.3.4', '', SYSTEM),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018b-Python-3.6.6.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018b-Python-3.6.6.eb
index 477357e8316..23ab0c1c4c6 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018b-Python-3.6.6.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-foss-2018b-Python-3.6.6.eb
@@ -28,7 +28,7 @@ builddependencies = [
     ('Eigen', '3.3.4', '', SYSTEM),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-intel-2018a-Python-2.7.14.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-intel-2018a-Python-2.7.14.eb
index 4e9c29f1e82..0e700bf34ec 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-intel-2018a-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.11.1-intel-2018a-Python-2.7.14.eb
@@ -28,7 +28,7 @@ builddependencies = [
     ('Eigen', '3.3.4', '', SYSTEM),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.14-foss-2019a-Python-3.7.2.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.14-foss-2019a-Python-3.7.2.eb
index 348b69dc0fa..b9c2b1c3ada 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.14-foss-2019a-Python-3.7.2.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.14-foss-2019a-Python-3.7.2.eb
@@ -29,7 +29,7 @@ dependencies = [
     ('Qt5', '5.12.3'),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.14-intel-2019a-Python-3.7.2.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.14-intel-2019a-Python-3.7.2.eb
index 06e1bc27024..6aedf7b94d6 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.14-intel-2019a-Python-3.7.2.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.14-intel-2019a-Python-3.7.2.eb
@@ -29,7 +29,7 @@ dependencies = [
     ('Qt5', '5.12.3'),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.14.1-foss-2019b-Python-3.7.4.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.14.1-foss-2019b-Python-3.7.4.eb
index cb31a9c9548..ba65e66905e 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.14.1-foss-2019b-Python-3.7.4.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.14.1-foss-2019b-Python-3.7.4.eb
@@ -29,7 +29,7 @@ dependencies = [
     ('Qt5', '5.13.1'),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.14.1-intel-2019b-Python-3.7.4.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.14.1-intel-2019b-Python-3.7.4.eb
index a7df31832b5..d811e682a82 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.14.1-intel-2019b-Python-3.7.4.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.14.1-intel-2019b-Python-3.7.4.eb
@@ -29,7 +29,7 @@ dependencies = [
     ('Qt5', '5.13.1'),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.14.3-gompi-2020a-Python-3.8.2.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.14.3-gompi-2020a-Python-3.8.2.eb
index 1414729ac05..7260e3f71ab 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.14.3-gompi-2020a-Python-3.8.2.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.14.3-gompi-2020a-Python-3.8.2.eb
@@ -29,7 +29,7 @@ dependencies = [
     ('Qt5', '5.14.1'),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.8-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.8-foss-2016a-Python-2.7.11.eb
index 365336b722a..adb729af93e 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.8-foss-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.8-foss-2016a-Python-2.7.11.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('libGLU', '9.0.0', '-Mesa-11.2.1'),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.8-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.8-intel-2016a-Python-2.7.11.eb
index f3c87201222..a1dd733fbe6 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.8-intel-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.8-intel-2016a-Python-2.7.11.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('libGLU', '9.0.0', '-Mesa-11.2.1'),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-foss-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-foss-2016b-Python-2.7.12.eb
index 1b7497c8401..a72147769ce 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-foss-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-foss-2016b-Python-2.7.12.eb
@@ -27,7 +27,7 @@ builddependencies = [
     ('Eigen', '3.2.9'),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-foss-2016b.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-foss-2016b.eb
index 32d7eeef907..43bf68bd47e 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-foss-2016b.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-foss-2016b.eb
@@ -25,7 +25,7 @@ builddependencies = [
     ('Eigen', '3.2.9'),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b-Python-2.7.12.eb
index 0e7a9977726..18bb1a2753c 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b-Python-2.7.12.eb
@@ -27,7 +27,7 @@ builddependencies = [
     ('Eigen', '3.2.9'),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b.eb
index 5e36b73d080..f30cfbdd292 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.8.1-intel-2016b.eb
@@ -25,7 +25,7 @@ builddependencies = [
     ('Eigen', '3.2.9'),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.9-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.9-intel-2016b-Python-2.7.12.eb
index a6c2c50e9a6..6eeda75c0fc 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.9-intel-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.9-intel-2016b-Python-2.7.12.eb
@@ -27,7 +27,7 @@ builddependencies = [
     ('Eigen', '3.3.3'),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.9-intel-2017a-Python-2.7.13.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.9-intel-2017a-Python-2.7.13.eb
index 75b9c8cc965..2c827ed9eda 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.9-intel-2017a-Python-2.7.13.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.9-intel-2017a-Python-2.7.13.eb
@@ -27,7 +27,7 @@ builddependencies = [
     ('Eigen', '3.3.3'),
 ]
 
-configopts = r"-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
 configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
 configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
 configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-2.4.4-foss-2021b.eb b/easybuild/easyconfigs/g/GDAL/GDAL-2.4.4-foss-2021b.eb
index ce4c4f200c5..0546c798085 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-2.4.4-foss-2021b.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-2.4.4-foss-2021b.eb
@@ -49,7 +49,7 @@ dependencies = [
     ('HDF', '4.2.15'),
 ]
 
-preconfigopts = "sed -e 's/-llapack/$LIBLAPACK/g' -i.eb configure && "
+preconfigopts = r"sed -e 's/-llapack/\$LIBLAPACK/g' -i.eb configure && "
 configopts = '--with-expat=$EBROOTEXPAT --with-libz=$EBROOTLIBZ'
 configopts += ' --with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF'
 configopts += ' --with-xml2=yes --with-geos=$EBROOTGEOS/bin/geos-config --with-jpeg=$EBROOTLIBJPEGMINTURBO'
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-2.4.4-intel-2021b.eb b/easybuild/easyconfigs/g/GDAL/GDAL-2.4.4-intel-2021b.eb
index 51b0b329e86..4f817551b4a 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-2.4.4-intel-2021b.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-2.4.4-intel-2021b.eb
@@ -49,7 +49,7 @@ dependencies = [
     ('HDF', '4.2.15'),
 ]
 
-preconfigopts = "sed -e 's/-llapack/$LIBLAPACK/g' -i.eb configure && "
+preconfigopts = r"sed -e 's/-llapack/\$LIBLAPACK/g' -i.eb configure && "
 configopts = '--with-expat=$EBROOTEXPAT --with-libz=$EBROOTLIBZ'
 configopts += ' --with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF'
 configopts += ' --with-xml2=yes --with-geos=$EBROOTGEOS/bin/geos-config --with-jpeg=$EBROOTLIBJPEGMINTURBO'
diff --git a/easybuild/easyconfigs/m/mosdepth/mosdepth-0.2.3-intel-2018a.eb b/easybuild/easyconfigs/m/mosdepth/mosdepth-0.2.3-intel-2018a.eb
index 5cdbb696a9f..5987627dfb1 100644
--- a/easybuild/easyconfigs/m/mosdepth/mosdepth-0.2.3-intel-2018a.eb
+++ b/easybuild/easyconfigs/m/mosdepth/mosdepth-0.2.3-intel-2018a.eb
@@ -31,7 +31,8 @@ dependencies = [
 extract_sources = True
 
 install_cmd = "cd %(builddir)s/hts-nim-*/ && nimble install --nimbleDir:%(installdir)s --verbose -y && "
-install_cmd += r"cd ../mosdepth-*/ && sed -i 's/0\.2\.2/%(version)s/g' mosdepth.nimble && "
+install_cmd += "cd ../mosdepth-*/ && "
+install_cmd += r"sed -i 's/0\.2\.2/%(version)s/g' mosdepth.nimble && "
 install_cmd += "nimble install --nimbleDir:%(installdir)s --verbose -y"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/m/mosdepth/mosdepth-0.2.4-foss-2018b.eb b/easybuild/easyconfigs/m/mosdepth/mosdepth-0.2.4-foss-2018b.eb
index c8c76363e57..b39e6fdc879 100644
--- a/easybuild/easyconfigs/m/mosdepth/mosdepth-0.2.4-foss-2018b.eb
+++ b/easybuild/easyconfigs/m/mosdepth/mosdepth-0.2.4-foss-2018b.eb
@@ -31,7 +31,8 @@ dependencies = [
 extract_sources = True
 
 install_cmd = "cd %(builddir)s/hts-nim-*/ && nimble install --nimbleDir:%(installdir)s --verbose -y && "
-install_cmd += r"cd ../mosdepth-*/ && sed -i 's/0\.2\.2/%(version)s/g' mosdepth.nimble && "
+install_cmd += "cd ../mosdepth-*/ && "
+install_cmd += r"sed -i 's/0\.2\.2/%(version)s/g' mosdepth.nimble && "
 install_cmd += "nimble install --nimbleDir:%(installdir)s --verbose -y"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2021.05-gomkl-2021a.eb b/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2021.05-gomkl-2021a.eb
index 376258b56d1..3f0596710cc 100644
--- a/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2021.05-gomkl-2021a.eb
+++ b/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2021.05-gomkl-2021a.eb
@@ -55,7 +55,7 @@ exts_list = [
         'checksums': ['20179f0b66359792ea283b69aa16366419132f3b6cf3adadc0c48e2e8118e573'],
     }),
     ('pandas', '1.2.4', {
-        'preinstallopts': r"""sed -i 's@extra_compile_args = \["-Werror"\]@extra_compile_args = []@g' setup.py && """,
+        'preinstallopts': """sed -i 's@extra_compile_args = \\["-Werror"\\]@extra_compile_args = []@g' setup.py && """,
         'checksums': ['649ecab692fade3cbfcf967ff936496b0cfba0af00a55dfaacd82bdda5cb2279'],
     }),
     ('mpmath', '1.2.1', {
diff --git a/easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-10.2.0.eb b/easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-10.2.0.eb
index 309b53a98ca..e6a30f87174 100644
--- a/easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-10.2.0.eb
+++ b/easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-10.2.0.eb
@@ -52,7 +52,7 @@ preconfigopts += " -e 's|SmithWatermanGotoh.h|smithwaterman/SmithWatermanGotoh.h
 preconfigopts += " -e 's|IntervalTree.h|intervaltree/IntervalTree.h|g'"
 preconfigopts += " -e 's|multichoose.h|multichoose/multichoose.h|g' -e 's|filevercmp.h|filevercmp/filevercmp.h|g'"
 preconfigopts += " -e 's|tabix.hpp|tabixpp/tabix.hpp|g' -e 's|Fasta.h|fastahack/Fasta.h|g'"
-preconfigopts += " -e 's|disorder.h|smithwaterman/disorder.h|g' {} \\; && "
+preconfigopts += r" -e 's|disorder.h|smithwaterman/disorder.h|g' {} \; && "
 
 postinstallcmds = ["cp -r %(builddir)s/%(name)s-%(version)s/scripts %(installdir)s"]
 
diff --git a/easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-10.3.0.eb b/easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-10.3.0.eb
index 3bdb2e54c3b..72046e18f73 100644
--- a/easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-10.3.0.eb
+++ b/easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-10.3.0.eb
@@ -52,7 +52,7 @@ preconfigopts += " -e 's|SmithWatermanGotoh.h|smithwaterman/SmithWatermanGotoh.h
 preconfigopts += " -e 's|IntervalTree.h|intervaltree/IntervalTree.h|g'"
 preconfigopts += " -e 's|multichoose.h|multichoose/multichoose.h|g' -e 's|filevercmp.h|filevercmp/filevercmp.h|g'"
 preconfigopts += " -e 's|tabix.hpp|tabixpp/tabix.hpp|g' -e 's|Fasta.h|fastahack/Fasta.h|g'"
-preconfigopts += " -e 's|disorder.h|smithwaterman/disorder.h|g' {} \\; && "
+preconfigopts += r" -e 's|disorder.h|smithwaterman/disorder.h|g' {} \; && "
 
 postinstallcmds = ["cp -r %(builddir)s/%(name)s-%(version)s/scripts %(installdir)s"]
 
diff --git a/easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-9.3.0-Python-3.8.2.eb b/easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-9.3.0-Python-3.8.2.eb
index 02c610e9a17..c5cca78049f 100644
--- a/easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-9.3.0-Python-3.8.2.eb
+++ b/easybuild/easyconfigs/v/vcflib/vcflib-1.0.2-GCC-9.3.0-Python-3.8.2.eb
@@ -53,7 +53,7 @@ preconfigopts += " -e 's|SmithWatermanGotoh.h|smithwaterman/SmithWatermanGotoh.h
 preconfigopts += " -e 's|IntervalTree.h|intervaltree/IntervalTree.h|g'"
 preconfigopts += " -e 's|multichoose.h|multichoose/multichoose.h|g' -e 's|filevercmp.h|filevercmp/filevercmp.h|g'"
 preconfigopts += " -e 's|tabix.hpp|tabixpp/tabix.hpp|g' -e 's|Fasta.h|fastahack/Fasta.h|g'"
-preconfigopts += " -e 's|disorder.h|smithwaterman/disorder.h|g' {} \\; && "
+preconfigopts += r" -e 's|disorder.h|smithwaterman/disorder.h|g' {} \; && "
 
 postinstallcmds = ["cp -r %(builddir)s/%(name)s-%(version)s/scripts %(installdir)s"]