aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--examples/config/uzbl/config4
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b0cb868..321ec82 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,7 @@ uzbl-core: ${OBJ}
uzbl-browser: uzbl-core
# packagers, set DESTDIR to your "package directory" and PREFIX to the prefix you want to have on the end-user system
+# end-users who build from source: don't care about DESTDIR, update PREFIX if you want to
PREFIX?=/usr/local
INSTALLDIR?=$(DESTDIR)$(PREFIX)
@@ -102,6 +103,7 @@ install-uzbl-browser: all
install -m755 examples/data/uzbl/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
sed -i 's#^PREFIX=.*#PREFIX=$(PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser
sed -i "s#^PREFIX = None#PREFIX = '$(PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager
+ sed -i 's#^set prefix.*=.*#set prefix = $(PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config
install-uzbl-tabbed: all
install -d $(INSTALLDIR)/bin
diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config
index 090ebd2..33783ac 100644
--- a/examples/config/uzbl/config
+++ b/examples/config/uzbl/config
@@ -1,6 +1,8 @@
# example uzbl config.
# all settings are optional. you can use uzbl without any config at all (but it won't do much)
+set prefix = /usr/local
+
# === Shortcuts ==============================================================
# request BIND <keycmd> = <command>
@@ -21,7 +23,7 @@ set set_status = set status_message =
set shell_cmd = sh -c
# Spawn path shortcuts. In spawn the first dir+path match is used in "dir1:dir2:dir3:executable"
-set scripts_dir = $XDG_DATA_HOME/uzbl:/usr/local/share/uzbl/examples/data/uzbl:scripts
+set scripts_dir = $XDG_DATA_HOME/uzbl:@prefix/share/uzbl/examples/data/uzbl:scripts
# === Handlers ===============================================================