[jhbuild] Correct get_makeargs usage (GNOME bug 682904)

[Craig Keogh <cskeogh src gnome org>]

commit 172afb61b203d26510d40cb01f04cbdc235ff44d
Author: Craig Keogh <cskeogh adam com au>
Date:   Wed Aug 29 08:03:47 2012 +0930

    Correct get_makeargs usage (GNOME bug 682904)
    
    after get_makeargs change in a3b1f62eb3 (GNOME bug 670213)

 jhbuild/modtypes/cmake.py |    8 ++++----
 jhbuild/modtypes/linux.py |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/jhbuild/modtypes/cmake.py b/jhbuild/modtypes/cmake.py
index d242c2b..e20ea09 100644
--- a/jhbuild/modtypes/cmake.py
+++ b/jhbuild/modtypes/cmake.py
@@ -101,7 +101,7 @@ class CMakeModule(MakeModule, DownloadableModule):
     def do_clean(self, buildscript):
         buildscript.set_action(_('Cleaning'), self)
         builddir = self.get_builddir(buildscript)
-        cmd = '%s %s clean' % (os.environ.get('MAKE', 'make'), self.get_makeargs())
+        cmd = '%s %s clean' % (os.environ.get('MAKE', 'make'), self.get_makeargs(buildscript))
         buildscript.execute(cmd, cwd = builddir,
                 extra_env = self.extra_env)
     do_clean.depends = [PHASE_CONFIGURE]
@@ -110,7 +110,7 @@ class CMakeModule(MakeModule, DownloadableModule):
     def do_build(self, buildscript):
         buildscript.set_action(_('Building'), self)
         builddir = self.get_builddir(buildscript)
-        cmd = '%s %s' % (os.environ.get('MAKE', 'make'), self.get_makeargs())
+        cmd = '%s %s' % (os.environ.get('MAKE', 'make'), self.get_makeargs(buildscript))
         buildscript.execute(cmd, cwd = builddir,
                 extra_env = self.extra_env)
     do_build.depends = [PHASE_CONFIGURE]
@@ -119,7 +119,7 @@ class CMakeModule(MakeModule, DownloadableModule):
     def do_dist(self, buildscript):
         buildscript.set_action(_('Creating tarball for'), self)
         cmd = '%s %s package_source' % (os.environ.get('MAKE', 'make'),
-                self.get_makeargs())
+                self.get_makeargs(buildscript))
         buildscript.execute(cmd, cwd = self.get_builddir(buildscript),
                 extra_env = self.extra_env)
     do_dist.depends = [PHASE_CONFIGURE]
@@ -130,7 +130,7 @@ class CMakeModule(MakeModule, DownloadableModule):
         builddir = self.get_builddir(buildscript)
         destdir = self.prepare_installroot(buildscript)
         cmd = '%s %s install DESTDIR=%s' % (os.environ.get('MAKE', 'make'),
-                self.get_makeargs(), destdir)
+                self.get_makeargs(buildscript), destdir)
         buildscript.execute(cmd,
                 cwd = builddir,
                 extra_env = self.extra_env)
diff --git a/jhbuild/modtypes/linux.py b/jhbuild/modtypes/linux.py
index f2cdef7..d5e79e1 100644
--- a/jhbuild/modtypes/linux.py
+++ b/jhbuild/modtypes/linux.py
@@ -94,7 +94,7 @@ class LinuxModule(MakeModule):
         for kconfig in self.kconfigs:
             cmd = '%s %s mrproper EXTRAVERSION=%s O=%s' % (
                     os.environ.get('MAKE', 'make'),
-                    self.get_makeargs(),
+                    self.get_makeargs(buildscript),
                     kconfig.version,
                     'build-' + kconfig.version)
             buildscript.execute(cmd, cwd = self.branch.srcdir,
@@ -142,7 +142,7 @@ class LinuxModule(MakeModule):
         for kconfig in self.kconfigs:
             cmd = '%s %s clean EXTRAVERSION=%s O=%s' % (
                     os.environ.get('MAKE', 'make'),
-                    self.get_makeargs(),
+                    self.get_makeargs(buildscript),
                     kconfig.version,
                     'build-' + kconfig.version)
             buildscript.execute(cmd, cwd = self.branch.srcdir,
@@ -154,7 +154,7 @@ class LinuxModule(MakeModule):
         buildscript.set_action(_('Building'), self)
         for kconfig in self.kconfigs:
             cmd = '%s %s EXTRAVERSION=%s O=%s' % (os.environ.get('MAKE', 'make'),
-                                                  self.get_makeargs(),
+                                                  self.get_makeargs(buildscript),
                                                   kconfig.version,
                                                   'build-' + kconfig.version)
             buildscript.execute(cmd, cwd = self.branch.srcdir,
@@ -186,7 +186,7 @@ class LinuxModule(MakeModule):
         for kconfig in self.kconfigs:
             cmd = '%s %s modules_install EXTRAVERSION=%s O=%s INSTALL_MOD_PATH=%s' % (
                     os.environ.get('MAKE', 'make'),
-                    self.get_makeargs(),
+                    self.get_makeargs(buildscript),
                     kconfig.version,
                     'build-' + kconfig.version,
                     buildscript.config.prefix)
@@ -201,7 +201,7 @@ class LinuxModule(MakeModule):
         for kconfig in self.kconfigs:
             cmd = '%s %s headers_install EXTRAVERSION=%s O=%s INSTALL_HDR_PATH=%s' % (
                     os.environ.get('MAKE', 'make'),
-                    self.get_makeargs(),
+                    self.get_makeargs(buildscript),
                     kconfig.version,
                     'build-' + kconfig.version,
                     buildscript.config.prefix)