Some paths tweaks, refactorings to make sugar self contained as much as possible

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 =                \

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)