[jhbuild] Pass LIB_INSTALL_DIR when building cmake modules

[Frederic Peters <fpeters src gnome org>]

commit d665c74f984163e34f4ac2f5c273fd9cbf56e7af
Author: Frédéric Péters <fpeters 0d be>
Date:   Sun May 23 18:12:15 2010 +0200

    Pass LIB_INSTALL_DIR when building cmake modules

 jhbuild/config.py         |    1 +
 jhbuild/modtypes/cmake.py |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/config.py b/jhbuild/config.py
index 4ab415b..fcb6791 100644
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@ -298,6 +298,7 @@ class Config:
             libdir = os.path.join(self.prefix, 'lib64')
         else:
             libdir = os.path.join(self.prefix, 'lib')
+        self.libdir = libdir
         addpath('LD_LIBRARY_PATH', libdir)
 
         # LDFLAGS and C_INCLUDE_PATH are required for autoconf configure
diff --git a/jhbuild/modtypes/cmake.py b/jhbuild/modtypes/cmake.py
index d91fde8..31a286b 100644
--- a/jhbuild/modtypes/cmake.py
+++ b/jhbuild/modtypes/cmake.py
@@ -66,7 +66,9 @@ class CMakeModule(Package, DownloadableModule):
         if not os.path.exists(builddir):
             os.mkdir(builddir)
         prefix = os.path.expanduser(buildscript.config.prefix)
-        cmd = ['cmake', '-DCMAKE_INSTALL_PREFIX=%s' % prefix, srcdir]
+        cmd = ['cmake', '-DCMAKE_INSTALL_PREFIX=%s' % prefix,
+               '-DLIB_INSTALL_DIR=%s' % buildscript.config.libdir,
+               srcdir]
         buildscript.execute(cmd, cwd = builddir, extra_env = self.extra_env)
     do_configure.depends = [PHASE_CHECKOUT]
     do_configure.error_phases = [PHASE_FORCE_CHECKOUT]