3 files changed, 3 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/chombo/package.py b/var/spack/repos/builtin/packages/chombo/package.py
index bc391e02c0..d0e4f9a301 100644
--- a/var/spack/repos/builtin/packages/chombo/package.py
+++ b/var/spack/repos/builtin/packages/chombo/package.py
@@ -106,7 +106,7 @@ class Chombo(MakefilePackage):
 
     def build(self, spec, prefix):
         with working_dir("lib"):
-            gmake("all")
+            make("all")
 
     def install(self, spec, prefix):
         with working_dir("lib"):
diff --git a/var/spack/repos/builtin/packages/gmake/package.py b/var/spack/repos/builtin/packages/gmake/package.py
index 22b43b812e..7a5845c1ec 100644
--- a/var/spack/repos/builtin/packages/gmake/package.py
+++ b/var/spack/repos/builtin/packages/gmake/package.py
@@ -56,7 +56,7 @@ class Gmake(AutotoolsPackage, GNUMirrorPackage):
 
     tags = ["build-tools"]
 
-    executables = ["^g?make$"]
+    executables = ["^make$"]
 
     @classmethod
     def determine_version(cls, exe):
@@ -84,6 +84,3 @@ class Gmake(AutotoolsPackage, GNUMirrorPackage):
         module.make = MakeExecutable(
             self.spec.prefix.bin.make, determine_number_of_jobs(parallel=dspec.package.parallel)
         )
-        module.gmake = MakeExecutable(
-            self.spec.prefix.bin.gmake, determine_number_of_jobs(parallel=dspec.package.parallel)
-        )
diff --git a/var/spack/repos/builtin/packages/xios/package.py b/var/spack/repos/builtin/packages/xios/package.py
index 2f692b4c6c..c310f8e9a4 100644
--- a/var/spack/repos/builtin/packages/xios/package.py
+++ b/var/spack/repos/builtin/packages/xios/package.py
@@ -148,7 +148,7 @@ OASIS_LIB=""
 
 %CPP            {CC} -E
 %FPP            {CC} -E -P -x c
-%MAKE           gmake
+%MAKE           make
 """.format(
                 **param
             )