jhbuild r1900 - in trunk: . jhbuild/modtypes

[gjc svn gnome org]

Author: gjc
Date: Sat Feb 16 16:16:17 2008
New Revision: 1900
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1900&view=rev

Log:
Bug 513925 â honor lib64 option in waf modules

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

Modified: trunk/jhbuild/modtypes/waf.py
==============================================================================
--- trunk/jhbuild/modtypes/waf.py	(original)
+++ trunk/jhbuild/modtypes/waf.py	Sat Feb 16 16:16:17 2008
@@ -105,6 +105,8 @@
         if buildscript.config.buildroot and not os.path.exists(builddir):
             os.makedirs(builddir)
         cmd = [self.waf_cmd, 'configure', '--prefix', buildscript.config.prefix]
+        if buildscript.config.use_lib64:
+            cmd += ["--libdir", os.path.join(buildscript.config.prefix, "lib64")]
         buildscript.execute(cmd, cwd=builddir)
     do_configure.next_state = STATE_CLEAN
     do_configure.error_states = [STATE_FORCE_CHECKOUT]