Integrate control panel in the build so that I can actually

distcheck.

bin/Makefile.am

@@ -2,8 +2,10 @@ bin_SCRIPTS = 			\
 	sugar			\
 	sugar-activity		\
 	sugar-backup		\
+	sugar-control-panel	\
 	sugar-install-bundle	\
-	sugar-launch
+	sugar-launch		\
+	sugar-shell
 
 EXTRA_DIST = $(bin_SCRIPTS) sugar.in
 

bin/sugar-control-panel

@@ -17,8 +17,11 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-import getopt, sys
+import sys
-    
+import getopt
+
+sys.path.insert(0, env.get_shell_path())
+ 
 import control 
         
 def cmd_help():

configure.ac

@@ -56,6 +56,7 @@ lib/sugar/datastore/Makefile
 services/Makefile
 services/shell/Makefile
 shell/Makefile
+shell/controlpanel/Makefile
 shell/intro/Makefile
 shell/hardware/Makefile
 shell/view/Makefile

shell/Makefile.am

@@ -1,6 +1,4 @@
-SUBDIRS = hardware model view intro
+SUBDIRS = controlpanel hardware model view intro
-
-bin_SCRIPTS = sugar-shell
 
 sugardir = $(pkgdatadir)/shell
 sugar_PYTHON =			\

shell/controlpanel/Makefile.am

@@ -0,0 +1,2 @@
+sugardir = $(pkgdatadir)/shell/controlpanel
+sugar_PYTHON = control.py