diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-30 23:05:16 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-30 23:05:16 (GMT) |
| commit | b72f00e30beff60e2ec551c4ed57d048061f1716 (patch) | |
| tree | e094e7e7c952a347f865416015d621c464078ac2 | |
| parent | 63d88df04012ee923cce24905f5f914cae3b9c31 (diff) | |
Integrate control panel in the build so that I can actually
distcheck.
| -rw-r--r-- | bin/Makefile.am | 4 | ||||
| -rwxr-xr-x | bin/sugar-control-panel (renamed from shell/controlpanel/sugar-control) | 7 | ||||
| -rwxr-xr-x | bin/sugar-shell (renamed from shell/sugar-shell) | 0 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | shell/Makefile.am | 4 | ||||
| -rw-r--r-- | shell/controlpanel/Makefile.am | 2 |
6 files changed, 12 insertions, 6 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am index fd72139..327df30 100644 --- 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 diff --git a/shell/controlpanel/sugar-control b/bin/sugar-control-panel index 4bee092..d978fed 100755 --- a/shell/controlpanel/sugar-control +++ b/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(): diff --git a/shell/sugar-shell b/bin/sugar-shell index 8f78289..8f78289 100755 --- a/shell/sugar-shell +++ b/bin/sugar-shell diff --git a/configure.ac b/configure.ac index 7844455..01c5645 100644 --- 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 diff --git a/shell/Makefile.am b/shell/Makefile.am index 56649be..4c9eac9 100644 --- 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 = \ diff --git a/shell/controlpanel/Makefile.am b/shell/controlpanel/Makefile.am new file mode 100644 index 0000000..353aeec --- /dev/null +++ b/shell/controlpanel/Makefile.am @@ -0,0 +1,2 @@ +sugardir = $(pkgdatadir)/shell/controlpanel +sugar_PYTHON = control.py |