aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Brendan Taylor <whateley@gmail.com>2011-04-11 19:58:03 -0600
committerGravatar Brendan Taylor <whateley@gmail.com>2011-04-11 19:58:03 -0600
commit3384703009e8190c8ad50821a4ace94c03733488 (patch)
tree45fdd2d6f5a5c24e9c5fffd05f38a3f17efdfd2b
parent54d90f3711abd0ad864fcb9767b27ca1f25541b2 (diff)
move examples/data/scripts/uzbl-tabbed to bin/uzbl-tabbed
-rw-r--r--Makefile5
-rwxr-xr-xbin/uzbl-tabbed (renamed from examples/data/scripts/uzbl-tabbed)0
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a3597df..df87c9e 100644
--- a/Makefile
+++ b/Makefile
@@ -92,10 +92,11 @@ test-uzbl-browser-sandbox: uzbl-browser
test-uzbl-tabbed-sandbox: uzbl-browser
make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-core
make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-browser
+ make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-tabbed
make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-example-data
cp -np ./misc/env.sh ./sandbox/env.sh
-. ./sandbox/env.sh && uzbl-event-manager restart -avv
- . ./sandbox/env.sh && ./sandbox/home/.local/share/uzbl/scripts/uzbl-tabbed
+ . ./sandbox/env.sh && uzbl-tabbed
. ./sandbox/env.sh && uzbl-event-manager stop -ivv
make DESTDIR=./sandbox uninstall
rm -rf ./sandbox/usr
@@ -146,7 +147,7 @@ install-uzbl-browser: install-dirs
rm $(INSTALLDIR)/bin/uzbl-event-manager.bak
install-uzbl-tabbed: install-dirs
- install -m755 examples/data/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed
+ install -m755 bin/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed
# you probably only want to do this manually when testing and/or to the sandbox. not meant for distributors
install-example-data:
diff --git a/examples/data/scripts/uzbl-tabbed b/bin/uzbl-tabbed
index a15967a..a15967a 100755
--- a/examples/data/scripts/uzbl-tabbed
+++ b/bin/uzbl-tabbed