From ea180a8cc03260b5ca9db31fba971ab5da6b4549 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sun, 25 Oct 2009 16:54:13 +0100 Subject: make uzbl-browser work out of the box (auto create xdg dirs, config, ..), rely on $PATH instead of own hacks, put python scripts that we actually use in $PREFIX/bin --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f368e99..6fe6f2c 100644 --- a/Makefile +++ b/Makefile @@ -61,10 +61,10 @@ test-dev: uzbl-core test-dev-browser: uzbl-browser XDG_DATA_HOME=./examples/data XDG_CACHE_HOME=./examples/cache XDG_CONFIG_HOME=./examples/config PATH="`pwd`:$$PATH" ./examples/data/uzbl/scripts/cookie_daemon.py start -nv & - XDG_DATA_HOME=./examples/data XDG_CACHE_HOME=./examples/cache XDG_CONFIG_HOME=./examples/config PATH="`pwd`:$$PATH" ./uzbl-daemon start -nv & - XDG_DATA_HOME=./examples/data XDG_CACHE_HOME=./examples/cache XDG_CONFIG_HOME=./examples/config PATH="`pwd`:$$PATH" ./uzbl-browser --uri http://www.uzbl.org --verbose + XDG_DATA_HOME=./examples/data XDG_CACHE_HOME=./examples/cache XDG_CONFIG_HOME=./examples/config PATH="`pwd`:$$PATH" ./examples/data/uzbl/scripts/event_manager.py start -nv & #still needed? uzbl-browser takes care of this? + XDG_DATA_HOME=./examples/data XDG_CACHE_HOME=./examples/cache XDG_CONFIG_HOME=./examples/config PATH="`pwd`:$$PATH:`pwd`/examples/data/uzbl/scripts/" ./uzbl-browser --uri http://www.uzbl.org --verbose XDG_DATA_HOME=./examples/data XDG_CACHE_HOME=./examples/cache XDG_CONFIG_HOME=./examples/config PATH="`pwd`:$$PATH" ./examples/data/uzbl/scripts/cookie_daemon.py stop -v - XDG_DATA_HOME=./examples/data XDG_CACHE_HOME=./examples/cache XDG_CONFIG_HOME=./examples/config PATH="`pwd`:$$PATH" ./uzbl-daemon stop -v + XDG_DATA_HOME=./examples/data XDG_CACHE_HOME=./examples/cache XDG_CONFIG_HOME=./examples/config PATH="`pwd`:$$PATH" ./examples/data/uzbl/scripts/event_manager.py stop -v test-share: uzbl-core XDG_DATA_HOME=${PREFIX}/share/uzbl/examples/data XDG_CONFIG_HOME=${PREFIX}/share/uzbl/examples/config ./uzbl-core --uri http://www.uzbl.org --verbose @@ -96,7 +96,9 @@ install-uzbl-core: all install-uzbl-browser: all install -d $(PREFIX)/bin install -m755 uzbl-browser $(PREFIX)/bin/uzbl-browser - install -m755 uzbl-daemon $(PREFIX)/bin/uzbl-daemon + install -m755 examples/data/uzbl/scripts/cookie_daemon.py $(PREFIX)/bin/cookie_daemon.py + install -m755 examples/data/uzbl/scripts/event_manager.py $(PREFIX)/bin/event_manager.py + sed -i 's#^PREFIX=.*#PREFIX=$(PREFIX)#' $(PREFIX)/bin/uzbl-browser install-uzbl-tabbed: all install -d $(PREFIX)/bin @@ -104,4 +106,6 @@ install-uzbl-tabbed: all uninstall: rm -rf $(PREFIX)/bin/uzbl-* + rm -rf $(PREFIX)/bin/cookie_daemon.py + rm -rf $(PREFIX)/bin/event_manager.py rm -rf $(PREFIX)/share/uzbl -- cgit v1.2.3