Keep the bindings private

7 files changed, 7 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 0895c3e..d0ca239 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ po/stamp-it
 po/sugar.pot
 po/*.gmo
 sugar/__installed__.py
+sugar/__uninstalled__.py
 tools/sugar-setup-activity
 shell/PresenceService/org.laptop.Presence.service
 threadframe
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 1da0053..e17ee82 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS = globalkeys threadframe
 
-bindingsdir = $(pythondir)/sugar_bindings
+bindingsdir = $(pkgdatadir)/bindings
 bindings_PYTHON = __init__.py
diff --git a/bindings/globalkeys/Makefile.am b/bindings/globalkeys/Makefile.am
index 210550a..cd2175b 100644
--- a/bindings/globalkeys/Makefile.am
+++ b/bindings/globalkeys/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES =			\
 	$(PYGTK_CFLAGS)		\
 	$(GLOBALKEYS_CFLAGS)
 
-globalkeysdir = $(pythondir)/sugar_bindings
+globalkeysdir = $(pkgdatadir)/bindings
 pkgpyexecdir = $(globalkeysdir)
 
 pkgpyexec_LTLIBRARIES = globalkeys.la
diff --git a/configure.ac b/configure.ac
index cb3a8bb..eec1823 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ shell/session/Makefile
 shell/PresenceService/Makefile
 sugar/Makefile
 sugar/__installed__.py
+sugar/__uninstalled__.py
 sugar/activity/Makefile
 sugar/canvas/Makefile
 sugar/chat/Makefile
diff --git a/shell/Shell.py b/shell/Shell.py
index f5ac18e..1a5e6fc 100755
--- a/shell/Shell.py
+++ b/shell/Shell.py
@@ -18,7 +18,7 @@ from sugar.activity import ActivityFactory
 from sugar.activity import Activity
 from FirstTimeDialog import FirstTimeDialog
 from panel.PanelManager import PanelManager
-from sugar_bindings.globalkeys import KeyGrabber
+from globalkeys import KeyGrabber
 from sugar import conf
 import sugar.logger
 
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in
index 06d787d..5ebed29 100644
--- a/sugar/__installed__.py.in
+++ b/sugar/__installed__.py.in
@@ -5,5 +5,6 @@ sugar_services_dir = '@prefix@/share/sugar/services'
 sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf'
 
 sugar_python_path = ['@prefix@/share/sugar/shell',
+					 '@prefix@/share/sugar/bindings',
 					 '@prefix@/share/sugar/activities']
 sugar_bin_path = []
diff --git a/sugar/__uninstalled__.py b/sugar/__uninstalled__.py.in
index 3069752..860cb21 100644
--- a/sugar/__uninstalled__.py
+++ b/sugar/__uninstalled__.py.in
@@ -10,7 +10,7 @@ sugar_service_dir = __tmpdir
 
 sugar_dbus_config = os.path.join(sugar_source_dir, 'dbus-uninstalled.conf')
 
-sugar_python_path = []
+sugar_python_path = ['@prefix@/share/sugar/bindings']
 sugar_python_path.append(sugar_source_dir)
 sugar_python_path.append(os.path.join(sugar_source_dir, 'shell'))
 sugar_python_path.append(os.path.join(sugar_source_dir, 'activities'))