diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-07-04 11:03:19 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-07-04 11:03:19 (GMT) |
commit | ef6aba68ad672d44811033eb2568db0c30ed9527 (patch) | |
tree | 853708ac250268ea430fa5c2847ce1f3933c8e61 /Makefile | |
parent | bb0a4da2fe52275d18a15ffdcb14acee6807e602 (diff) |
Allow to run another instance inside sugar
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -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) |