merge to tip of tree

README

@@ -11,28 +11,28 @@ Building
 
 You will need gnome-common.
 
-./autogen.sh
+./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 make
-make install
+make install # make require root privileges
 
 Running
 =======
 
-sugar
+To run the python sources from your source tree run
 
+ $ ./setup-run-from-source.sh
 
-Debug
-=====
+in the top-level directory. Icons and other resources are still loaded
+from the installed location though.
 
-To run the shell:
+To run the shell
 
-sugar shell
+ $ cd shell/src
+ $ ./shell.py
 
-To run the chat activity:
+You can run activities like this
 
-sugar chat
-
-To run the web activity:
-
-sugar browser
+ $ cd browser
+ $ ./browser.py
 
+(Just remember to have the shell running)