From 096d5c523813b9716ef10d7f76e3f2c02717ae37 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Mon, 16 Oct 2006 13:40:59 +0200
Subject: [PATCH] Fix makefiles

---
 Makefile.am            | 3 +++
 shell/conf/Makefile.am | 3 +--
 sugar-emulator         | 2 +-
 sugar/Makefile.am      | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3539e935..3ae1ba5b 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 a7480f82..0c3967ca 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 5d97e0f8..a49eee80 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 7e2b0d29..ae2e2ee0 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		\