From 5a4bf4be6b0e8549f2542568ce4bce197bee57d9 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 15 Apr 2007 13:04:38 +0200 Subject: [PATCH] Some paths tweaks, refactorings to make sugar self contained as much as possible --- bin/Makefile.am | 4 ++++ sugar/env.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index db5e2196..ffbc7bba 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,3 +1,6 @@ +sugardir = $(pkgdatadir)/bin +sugar_SCRIPTS = sugar-activity-factory + bin_SCRIPTS = \ sugar \ sugar-activity \ @@ -6,6 +9,7 @@ bin_SCRIPTS = \ EXTRA_DIST = \ $(bin_SCRIPTS) \ + $(sugar_SCRIPTS) \ sugar.in DISTCLEANFILES = \ diff --git a/sugar/env.py b/sugar/env.py index f25f4606..a8d8ef0f 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -57,7 +57,7 @@ def get_user_activities_path(): return os.path.expanduser('~/Activities') def get_bin_path(path=None): - return _get_prefix_path('bin', path) + return _get_prefix_path('share/sugar/bin', path) def get_locale_path(path=None): return _get_prefix_path('share/locale', path)