diff --git a/bin/tools/buildParaView3.3-cvs b/bin/buildParaView3.3-cvs
similarity index 99%
rename from bin/tools/buildParaView3.3-cvs
rename to bin/buildParaView3.3-cvs
index aadd851dbbf6fc641f207d5c16f04fe009e9df33..e4fbe093142182c05eba6d8d1ba35d8e4c13b053 100755
--- a/bin/tools/buildParaView3.3-cvs
+++ b/bin/buildParaView3.3-cvs
@@ -42,7 +42,7 @@ PARAVIEW_MAJOR_VERSION="3.3"
 VERBOSE=OFF
 INCLUDE_MPI=ON
 MPI_MAX_PROCS=32
-INCLUDE_PYTHON=ON
+INCLUDE_PYTHON=OFF
 #PYTHON_LIBRARY="/usr/lib64/libpython2.5.so.1.0"
 PYTHON_LIBRARY=""
 INCLUDE_MESA=OFF
diff --git a/bin/tools/buildParaViewFunctions b/bin/tools/buildParaViewFunctions
index 5d70681343ea8f52db6e43234fe19a5e10667efa..cf04183f80bdd5ddc849cc897bc14ba186ff3e91 100644
--- a/bin/tools/buildParaViewFunctions
+++ b/bin/tools/buildParaViewFunctions
@@ -232,6 +232,18 @@ installParaView ()
                 -print
         fi
 
+        # Replace local CMAKE_HOME path with CMAKE_HOME
+        # environment variables
+        find . -iname '*cmake*' -execdir sed -i \
+            "s,$CMAKE_HOME,\$ENV{CMAKE_HOME},g" {} ';' \
+            -print
+
+        # Replace local WM_COMPILER_DIR path with WM_COMPILER_DIR
+        # environment variables
+        find . -iname '*cmake*' -execdir sed -i \
+            "s,$WM_COMPILER_DIR,\$ENV{WM_COMPILER_DIR},g" {} ';' \
+            -print
+
         # create a softlink to the $PARAVIEW_OBJ_DIR/bin folder
         # - workaround for chosen install location
         echo "    Creating paraview $PARAVIEW_MAJOR_VERSION soft link to /bin"