From 12fad463d03e736fef8cf11c5d68b7b9af6e38da Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Wed, 1 Dec 2010 11:46:24 -0700 Subject: set config @prefix based on uzbl-browser's PREFIX --- Makefile | 3 --- src/uzbl-browser | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 04f35d0..e4d1b42 100644 --- a/Makefile +++ b/Makefile @@ -119,9 +119,6 @@ install-uzbl-core: all install-dirs install -m644 AUTHORS $(DOCDIR)/ cp -r examples $(INSTALLDIR)/share/uzbl/ chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/* - mv $(INSTALLDIR)/share/uzbl/examples/config/config $(INSTALLDIR)/share/uzbl/examples/config/config.bak - sed 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' < $(INSTALLDIR)/share/uzbl/examples/config/config.bak > $(INSTALLDIR)/share/uzbl/examples/config/config - rm $(INSTALLDIR)/share/uzbl/examples/config/config.bak install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core install-uzbl-browser: uzbl-cookie-manager install-dirs diff --git a/src/uzbl-browser b/src/uzbl-browser index 88d3742..3c9562d 100755 --- a/src/uzbl-browser +++ b/src/uzbl-browser @@ -8,6 +8,8 @@ # to your $XDG_DATA_HOME/uzbl/scripts/ and edit them PREFIX=/usr/local +export PREFIX + EXAMPLES=$PREFIX/share/uzbl/examples XDG_DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share} -- cgit v1.2.3