[jhbuild] waf: Support install with DESTDIR
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] waf: Support install with DESTDIR
- Date: Fri, 17 Jun 2011 19:27:49 +0000 (UTC)
commit 76dbb7f62e7a1c48154f0b86ff916390186fed31
Author: Colin Walters <walters verbum org>
Date: Tue May 24 20:26:40 2011 -0400
waf: Support install with DESTDIR
Similar to autotools.
https://bugzilla.gnome.org/show_bug.cgi?id=647231
jhbuild/modtypes/waf.py | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/jhbuild/modtypes/waf.py b/jhbuild/modtypes/waf.py
index c62106d..e12b16c 100644
--- a/jhbuild/modtypes/waf.py
+++ b/jhbuild/modtypes/waf.py
@@ -49,6 +49,7 @@ class WafModule(Package, DownloadableModule):
Package.__init__(self, name, dependencies, after, suggests)
self.branch = branch
self.waf_cmd = waf_cmd
+ self.supports_install_destdir = True
def get_srcdir(self, buildscript):
return self.branch.srcdir
@@ -127,9 +128,10 @@ class WafModule(Package, DownloadableModule):
def do_install(self, buildscript):
buildscript.set_action(_('Installing'), self)
- cmd = [self.waf_cmd, 'install']
+ destdir = self.prepare_installroot(buildscript)
+ cmd = [self.waf_cmd, 'install', '--destdir', destdir]
buildscript.execute(cmd, cwd=self.get_builddir(buildscript))
- buildscript.packagedb.add(self.name, self.get_revision() or '')
+ self.process_install(buildscript, self.get_revision())
do_install.depends = [PHASE_BUILD]
def do_uninstall(self, buildscript):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]