From ef6aba68ad672d44811033eb2568db0c30ed9527 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Wed, 04 Jul 2012 11:03:19 +0000
Subject: Allow to run another instance inside sugar

---
(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8faa5bb..81175e8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,12 @@ SCRIPTS = $(CURDIR)/scripts
 JHBUILD = $(CURDIR)/install/bin/jhbuild -f $(SCRIPTS)/jhbuildrc
 LOG = $(SCRIPTS)/log-command
 
+ifdef SUGAR_SESSION
+XINITDISPLAY = :100
+else
+XINITDISPLAY = :99
+endif
+
 # The buildbot shell does not handle script properly. It's unnecessary
 # anyway because we can't use interactive scripts there.
 ifdef SUGAR_BUILDBOT
@@ -43,7 +49,7 @@ build-%:
 	$(TYPESCRIPT) "$(JHBUILD) buildone $*" $(LOGFILE)
 
 run: scripts/list-outputs
-	xinit $(SCRIPTS)/xinitrc -- :99
+	xinit $(SCRIPTS)/xinitrc -- $(XINITDISPLAY)
 
 test:
 	$(LOG) "$(SCRIPTS)/run-dogtail-tests" $(LOGFILE)
--
cgit v0.9.1