Integrate control panel in the build so that I can actually

distcheck.
2007-10-31 00:05:16 +01:00 · 2007-10-31 00:05:16 +01:00 · b72f00e30b
commit b72f00e30b
parent 63d88df040
6 changed files with 12 additions and 6 deletions
--- a/bin/Makefile.am
+++ b/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

--- a/shell/controlpanel/sugar-control
+++ b/shell/controlpanel/sugar-control
@ -17,7 +17,10 @@
 # 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 
        
--- a/shell/sugar-shell
+++ b/shell/sugar-shell
--- a/configure.ac
+++ b/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
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@ -1,6 +1,4 @@
-SUBDIRS = hardware model view intro
-
-bin_SCRIPTS = sugar-shell
+SUBDIRS = controlpanel hardware model view intro

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