From 796785c342bffa78698b63691d2f7fd67aca3d96 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Thu, 17 Dec 2009 18:59:02 +0100 Subject: [PATCH 1/2] unbreak Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 43a3077b4..0017bbe71 100644 --- a/Makefile +++ b/Makefile @@ -101,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 @@ -109,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 From a2750abacb2cc9460aeb99cc9e960be0bd062b09 Mon Sep 17 00:00:00 2001 From: Mason Larobina Date: Fri, 18 Dec 2009 20:29:58 +0800 Subject: [PATCH 2/2] Use explicit make test targets & clean xdg sandbox dirs in clean target. --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 84fe4fef8..e13d6841e 100644 --- a/Makefile +++ b/Makefile @@ -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