diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-16 11:40:59 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-10-16 11:40:59 (GMT) |
| commit | 096d5c523813b9716ef10d7f76e3f2c02717ae37 (patch) | |
| tree | 63932d01ccdcd71037a2d2050dbd267b71536ae1 | |
| parent | 6bd4e0f7938cce5fbf73d327bdc20a52cdee5af8 (diff) | |
Fix makefiles
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | shell/conf/Makefile.am | 3 | ||||
| -rwxr-xr-x | sugar-emulator | 2 | ||||
| -rw-r--r-- | sugar/Makefile.am | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 3539e93..3ae1ba5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,9 @@ ACLOCAL_AMFLAGS = -I m4 dbusconfdir = $(pkgdatadir) dbusconf_DATA = dbus-installed.conf +bin_SCRIPTS = \ + sugar-emulator + install-data-local: $(top_srcdir)/sugar/setup.py \ $(top_srcdir)/activities \ diff --git a/shell/conf/Makefile.am b/shell/conf/Makefile.am index a7480f8..0c3967c 100644 --- a/shell/conf/Makefile.am +++ b/shell/conf/Makefile.am @@ -1,5 +1,4 @@ sugardir = $(pkgdatadir)/shell/conf sugar_PYTHON = \ __init__.py \ - ActivityRegistry.py \ - Profile.py + ActivityRegistry.py diff --git a/sugar-emulator b/sugar-emulator index 5d97e0f..a49eee8 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -37,7 +37,7 @@ from sugar.emulator import Emulator emulator = Emulator() emulator.start() -program = 'sugar-session' +program = 'sugar-shell' if len(sys.argv) > 1: program = sys.argv[1] os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', diff --git a/sugar/Makefile.am b/sugar/Makefile.am index 7e2b0d2..ae2e2ee 100644 --- a/sugar/Makefile.am +++ b/sugar/Makefile.am @@ -7,6 +7,7 @@ sugar_PYTHON = \ emulator.py \ env.py \ logger.py \ + profile.py \ setup.py \ simulator.py \ TracebackUtils.py \ |