[jhbuild/jhdebuild: 536/536] Merge branch 'master' into jhdebuild

[John Carr <johncarr src gnome org>]

commit b62a04abb75f73a32dfb65f97c2f2aa41b182bda
Merge: 9508788... 92c3163...
Author: John Carr <john carr unrouted co uk>
Date:   Sun May 17 19:40:20 2009 +0100

    Merge branch 'master' into jhdebuild

 jhbuild/commands/base.py      |    4 ++++
 jhbuild/modtypes/autotools.py |   20 +++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --cc jhbuild/modtypes/autotools.py
index dd7e4b7,4be49a3..021510a
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@@ -252,12 -252,11 +258,14 @@@ class AutogenModule(Package, DebianBase
      do_dist.depends = [PHASE_CONFIGURE]
      do_dist.error_phases = [PHASE_FORCE_CHECKOUT, PHASE_CONFIGURE]
  
 +    def skip_install(self, buildscript, last_state):
 +        return buildscript.config.nobuild
 +
      def do_distcheck(self, buildscript):
          buildscript.set_action(_('Creating tarball for'), self)
-         cmd = '%s %s distcheck' % (os.environ.get('MAKE', 'make'), self.makeargs)
+         makeargs = self.makeargs + ' ' + self.config.module_makeargs.get(
+                 self.name, self.config.makeargs)
+         cmd = '%s %s distcheck' % (os.environ.get('MAKE', 'make'), makeargs)
          buildscript.execute(cmd, cwd = self.get_builddir(buildscript),
                      extra_env = self.extra_env)
      do_dist.depends = [PHASE_CONFIGURE]