Complete paths cleanup and remove SUGAR_PREFIX and

SUGAR_PATH environment variables.

bin/.gitignore

@@ -1,3 +1,4 @@
 sugar-control-panel
+sugar-emulator
 sugar-shell
 sugar-shell-service

bin/Makefile.am

@@ -3,6 +3,7 @@ bin_SCRIPTS = 			\
 	sugar-activity		\
 	sugar-backup		\
 	sugar-control-panel	\
+	sugar-emulator		\
 	sugar-install-bundle	\
 	sugar-launch		\
 	sugar-shell		\

bin/sugar-emulator.in

@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+# Copyright (C) 2008, Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import sys
+
+sys.path.insert(0, '@prefix@/share/sugar/shell')
+
+from emulator import main
+
+main()
+
+

bin/sugar.in

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-export SUGAR_PREFIX=@prefix@
-export SUGAR_PATH=@prefix@/share/sugar
 export GTK2_RC_FILES=@prefix@/share/sugar/data/sugar-xo.gtkrc
 if [ -f /etc/olpc-security ] ; then
   exec dbus-launch --exit-with-session --config-file=/etc/dbus-1/session-olpc.conf sugar-shell