From: Tom Adams Date: Sun, 23 Aug 2009 19:52:47 +0000 (+0100) Subject: PREFIX is /usr/local by default, not /usr. X-Git-Url: http://git.maemo.org/git/?p=uzbl-mobile;a=commitdiff_plain;h=a86e78ca92dbc9e13a7f5307d6dcdeadee6d9431;hp=46da0c91288a9c9d20af3a92c58b1dc6a00de4f4 PREFIX is /usr/local by default, not /usr. Fixes: FS#80 - PREFIX should not be /usr FS#84 - Installation path should default to /usr/local, not /usr --- diff --git a/Makefile b/Makefile index fbc85a1..78ff400 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -p all: uzbl uzblctrl -PREFIX?=$(DESTDIR)/usr +PREFIX?=$(DESTDIR)/usr/local # When compiling unit tests, compile uzbl as a library first tests: uzbl.o @@ -22,7 +22,7 @@ test-dev: uzbl XDG_DATA_HOME=./examples/data XDG_CONFIG_HOME=./examples/config ./uzbl --uri http://www.uzbl.org --verbose test-share: uzbl - XDG_DATA_HOME=/usr/share/uzbl/examples/data XDG_CONFIG_HOME=/usr/share/uzbl/examples/config ./uzbl --uri http://www.uzbl.org --verbose + XDG_DATA_HOME=${PREFIX}/share/uzbl/examples/data XDG_CONFIG_HOME=${PREFIX}/share/uzbl/examples/config ./uzbl --uri http://www.uzbl.org --verbose clean: