Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2006-10-06 21:34:11 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2006-10-06 21:34:11 (GMT)
commit55f82602c4e7dfdaa4e402d1166bbd2bf75d1d27 (patch)
tree61d59bd0ed5a2cb014f3ddb1b8cb7bf5e5038b37
parent18716b308e614c9a7a93d687dbb33854a0129864 (diff)
parent41c2ddeb818a821dbba3bd390f043ea019bd2812 (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
-rw-r--r--tools/sugar-setup-activity.in14
1 files changed, 12 insertions, 2 deletions
diff --git a/tools/sugar-setup-activity.in b/tools/sugar-setup-activity.in
index 6a3263e..a3ea08e 100644
--- a/tools/sugar-setup-activity.in
+++ b/tools/sugar-setup-activity.in
@@ -3,8 +3,18 @@ import sys
from sugar import setup
+if len(sys.argv) > 2:
+ prefix = sys.argv[2]
+else:
+ prefix = '@prefix@'
+
+if len(sys.argv) > 3:
+ root = sys.argv[3]
+else:
+ root = ''
+
setup.setup_activity(sys.argv[1],
- '@prefix@/share/sugar/activities',
- '@prefix@/bin/sugar-activity-factory')
+ '%s%s/share/sugar/activities' % (root, prefix),
+ '%s/bin/sugar-activity-factory' % prefix)
print '%s installed.' % sys.argv[1]