diff options
| author |  Brendan Taylor <whateley@gmail.com> | 2010-11-20 11:16:46 -0700 |
|---|---|---|
| committer | Brendan Taylor <whateley@gmail.com> | 2010-11-20 11:16:46 -0700 |
| commit | 94e8cc68125a285d57200cf331bdc5d635aacde4 (patch) | |
| tree | 09ace8909ce60c699b9e6c48390d87ad53166af2 /Makefile | |
| parent | ba159dbb277adf7532e4e2f09dcfa461084c9455 (diff) | |
| parent | bf26eec507fed8524368e523eadc5b798a40e870 (diff) | |
Merge branch 'dev/fix-uzbl-tabbed'
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -66,8 +66,8 @@ test-uzbl-browser-sandbox: uzbl-browser make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-browser make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-example-data cp -np ./misc/env.sh ./sandbox/env.sh - source ./sandbox/env.sh && uzbl-cookie-manager -v & - source ./sandbox/env.sh && uzbl-event-manager restart -navv & + -source ./sandbox/env.sh && uzbl-cookie-manager -v + -source ./sandbox/env.sh && uzbl-event-manager restart -avv source ./sandbox/env.sh && uzbl-browser --uri http://www.uzbl.org --verbose kill `cat ./sandbox/home/.cache/uzbl/cookie_daemon_socket.pid` source ./sandbox/env.sh && uzbl-event-manager stop -ivv @@ -79,8 +79,8 @@ test-uzbl-tabbed-sandbox: uzbl-browser make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-browser make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-example-data cp -np ./misc/env.sh ./sandbox/env.sh - source ./sandbox/env.sh && uzbl-cookie-manager -v & - source ./sandbox/env.sh && uzbl-event-manager restart -navv & + -source ./sandbox/env.sh && uzbl-cookie-manager -v + -source ./sandbox/env.sh && uzbl-event-manager restart -avv source ./sandbox/env.sh && ./sandbox/home/.local/share/uzbl/scripts/uzbl-tabbed kill `cat ./sandbox/home/.cache/uzbl/cookie_daemon_socket.pid` source ./sandbox/env.sh && uzbl-event-manager stop -ivv |