diff --git a/share/build/buildlib.spio b/share/build/buildlib.spio
index be3242adda7c..57423c51bde3 100755
--- a/share/build/buildlib.spio
+++ b/share/build/buildlib.spio
@@ -18,7 +18,7 @@ def extract_from_macros(macro_dump, varname):
 ###############################################################################
     look_for = f"{varname} :="
     for line in macro_dump.splitlines():
-        if look_for in line:
+        if line.startswith(look_for):
             return line.split(":=")[-1].strip()
 
     return ""
@@ -131,7 +131,7 @@ def buildlib(bldroot, installpath, case):
     #     os.environ["HDF5"] = os.path.dirname(os.path.dirname(which_h5dump))
 
     if "WITH_HDF5_SCORPIO" in os.environ:
-        cmake_opts += "-DWITH_HDF5=On "
+        cmake_opts += "-DWITH_HDF5:BOOL=ON "
 
     # Same deal with libz and szip
     if "ZLIB_ROOT" in os.environ: