From f4324ad8bff1e1fb6594d599c5aa8b2149621cd2 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Tue, 07 Aug 2012 11:40:38 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:sugar-build/sugar-build

---
(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 946f362..25e0417 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ LOGFILE = $(CURDIR)/logs/build-$(TIMESTAMP).log
 SCRIPTS = $(CURDIR)/scripts
 JHBUILD = $(CURDIR)/install/bin/jhbuild -f $(SCRIPTS)/jhbuildrc
 LOG = $(SCRIPTS)/log-command
-XINITDISPLAY = `$(SCRIPTS)/find-free-display`
 
 # The buildbot shell does not handle script properly. It's unnecessary
 # anyway because we can't use interactive scripts there.
@@ -50,7 +49,7 @@ build-%:
 	$(TYPESCRIPT) "$(JHBUILD) buildone $*" $(LOGFILE)
 
 run: x11-utils
-	xinit $(SCRIPTS)/xinitrc -- $(XINITDISPLAY) &>>$(LOGFILE)
+	$(SCRIPTS)/shell/start-sugar
 
 test: x11-utils
 	$(LOG) "$(SCRIPTS)/run-dogtail-tests" $(LOGFILE)
--
cgit v0.9.1