diff options
| author |  Mason Larobina <mason.larobina@gmail.com> | 2009-12-19 00:06:25 +0800 |
|---|---|---|
| committer | Mason Larobina <mason.larobina@gmail.com> | 2009-12-19 00:06:25 +0800 |
| commit | 5365536bbde8fee3ab2dc29ce576ea365b367c98 (patch) | |
| tree | 72336f04d04e6048561451d5c3af43a3e6b5d5a5 | |
| parent | 227ea04a300da1d0f721721a213ae76632443b90 (diff) | |
| parent | a2750abacb2cc9460aeb99cc9e960be0bd062b09 (diff) | |
Merge branch 'master' into onexec-nonarg-binds
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -62,13 +62,13 @@ test-uzbl-browser: uzbl-browser ./uzbl-browser --uri http://www.uzbl.org --verbose test-uzbl-core-sandbox: uzbl-core - make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install + make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-core source ./sandbox/env.sh && uzbl-core --uri http://www.uzbl.org --verbose make DESTDIR=./sandbox uninstall rm -rf ./sandbox/usr test-uzbl-browser-sandbox: uzbl-browser - make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install + make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-browser source ./sandbox/env.sh && uzbl-cookie-daemon restart -nv & source ./sandbox/env.sh && uzbl-event-manager restart -nav & source ./sandbox/env.sh && uzbl-browser --uri http://www.uzbl.org --verbose @@ -85,6 +85,7 @@ clean: rm -f inspector.o find examples/ -name "*.pyc" -delete cd ./tests/; $(MAKE) clean + rm -rf ./sandbox/{examples,usr}/ install: install-uzbl-core install-uzbl-browser install-uzbl-tabbed @@ -100,7 +101,7 @@ install-uzbl-core: all install -m644 README $(INSTALLDIR)/share/uzbl/docs sed -i 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config -install-uzbl-browser: all +install-uzbl-browser: install-uzbl-core install -d $(INSTALLDIR)/bin install -m755 uzbl-browser $(INSTALLDIR)/bin/uzbl-browser install -m755 examples/data/uzbl/scripts/uzbl-cookie-daemon $(INSTALLDIR)/bin/uzbl-cookie-daemon @@ -108,7 +109,7 @@ install-uzbl-browser: all sed -i 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser sed -i "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager -install-uzbl-tabbed: all +install-uzbl-tabbed: install-uzbl-browser install -d $(INSTALLDIR)/bin install -m755 examples/data/uzbl/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed |