jhbuild r1997 - in trunk: . jhbuild/modtypes

[fpeters svn gnome org]

Author: fpeters
Date: Sat Apr  5 14:58:44 2008
New Revision: 1997
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1997&view=rev

Log:
* jhbuild/modtypes/tarball.py: add support for makefile attribute for
tarball modules (closes: #526316)



Modified:
   trunk/ChangeLog
   trunk/jhbuild/modtypes/tarball.py

Modified: trunk/jhbuild/modtypes/tarball.py
==============================================================================
--- trunk/jhbuild/modtypes/tarball.py	(original)
+++ trunk/jhbuild/modtypes/tarball.py	Sat Apr  5 14:58:44 2008
@@ -32,6 +32,7 @@
     autogenargs = ''
     makeargs = ''
     supports_non_srcdir_builds = True
+    makefile = 'Makefile'
     if node.hasAttribute('checkoutdir'):
         checkoutdir = node.getAttribute('checkoutdir')
     if node.hasAttribute('autogenargs'):
@@ -41,6 +42,9 @@
     if node.hasAttribute('supports-non-srcdir-builds'):
         supports_non_srcdir_builds = \
             (node.getAttribute('supports-non-srcdir-builds') != 'no')
+    if node.hasAttribute('makefile'):
+        makefile = node.getAttribute('makefile')
+
     for childnode in node.childNodes:
         if childnode.nodeType != childnode.ELEMENT_NODE: continue
         if childnode.nodeName == 'source':
@@ -86,6 +90,6 @@
             dependencies, after, suggests,
             supports_non_srcdir_builds = supports_non_srcdir_builds,
             skip_autogen = False, autogen_sh = 'configure',
-            extra_env = extra_env)
+            makefile = makefile, extra_env = extra_env)
 
 register_module_type('tarball', parse_tarball)