[jhbuild/wip/destdir: 5/10] cmake: Support make install DESTDIR=



commit 89f9b1b5cdd4deeaacdf503abfc11540175930bd
Author: Colin Walters <walters verbum org>
Date:   Tue May 24 20:10:25 2011 -0400

    cmake: Support make install DESTDIR=
    
    See similar patch for autotools.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=647231

 jhbuild/modtypes/cmake.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/jhbuild/modtypes/cmake.py b/jhbuild/modtypes/cmake.py
index 27f1d41..b24eb83 100644
--- a/jhbuild/modtypes/cmake.py
+++ b/jhbuild/modtypes/cmake.py
@@ -44,6 +44,7 @@ class CMakeModule(Package, DownloadableModule):
         self.branch = branch
         self.cmakeargs = cmakeargs
         self.makeargs  = makeargs
+        self.supports_install_destdir = True
 
     def get_srcdir(self, buildscript):
         return self.branch.srcdir
@@ -129,12 +130,13 @@ class CMakeModule(Package, DownloadableModule):
     def do_install(self, buildscript):
         buildscript.set_action(_('Installing'), self)
         builddir = self.get_builddir(buildscript)
-        cmd = '%s %s install' % (os.environ.get('MAKE', 'make'),
-                self.get_makeargs())
+        destdir = self.prepare_installroot(buildscript)
+        cmd = '%s %s install DESTDIR=%s' % (os.environ.get('MAKE', 'make'),
+                self.get_makeargs(), destdir)
         buildscript.execute(cmd,
                 cwd = builddir,
                 extra_env = self.extra_env)
-        buildscript.packagedb.add(self.name, self.get_revision() or '')
+        self.process_install(buildscript, self.get_revision())
     do_install.depends = [PHASE_BUILD]
 
     def xml_tag_and_attrs(self):



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]