From 5923202d300b0441cfb39a55a78a6513b0126771 Mon Sep 17 00:00:00 2001
From: Sascha Silbe <silbe@sugarlabs.org>
Date: Mon, 22 Aug 2011 11:14:17 +0000
Subject: Work around upstream jhbuild requiring DESTDIR support (SL#2980)

Upstream decided to fail hard on modules that don't support DESTDIR
(Gnome#654592), but sugar.activity.bundlebuilder doesn't support DESTDIR
yet (SL#2947).

Signed-off-by: Sascha Silbe <silbe@sugarlabs.org>
---
diff --git a/sjhbuild/bundlemodule.py b/sjhbuild/bundlemodule.py
index 3f9ec0c..bc50227 100644
--- a/sjhbuild/bundlemodule.py
+++ b/sjhbuild/bundlemodule.py
@@ -41,7 +41,9 @@ class BundleModule(distutils.DistutilsModule):
         cmd.extend(['install',
                     '--prefix', buildscript.config.prefix])
         buildscript.execute(cmd, cwd = srcdir, extra_env = self.extra_env)
-        self.process_install(buildscript, self.get_revision())
+        # sugar.activity.bundlebuilder doesn't support --root (SL#2947)
+#        self.process_install(buildscript, self.get_revision())
+    do_install.depends = [distutils.DistutilsModule.PHASE_BUILD]
 
 
 def parse_bundle(node, config, uri, repositories, default_repo):
--
cgit v0.9.1