Make the default prefix /usr

We're already assuming this in several places, and it's too much work to
make those files autogenerated when no one's going to use that feature.

diff --git a/Makefile b/Makefile
index d12b7d7..36ae952 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ CC = gcc
 CFLAGS = -Wall -Os
 CPPFLAGS = `pkg-config --cflags dbus-glib-1`
 LDFLAGS = `pkg-config --libs dbus-glib-1`
-PREFIX = /usr/local
+PREFIX = /usr
 
 APP = browser-switchboard
 obj = main.o launcher.o dbus-server-bindings.o configfile.o

diff --git a/config-ui/Makefile b/config-ui/Makefile
index 1e69b23..8e174d0 100644 (file)
--- a/config-ui/Makefile
+++ b/config-ui/Makefile
@@ -9,7 +9,7 @@ LDFLAGS = `pkg-config --libs gtk+-2.0`
 LDFLAGS_HILDON = `pkg-config --libs hildon-1`
 LDFLAGS_PLUGIN = -shared $(LDFLAGS_HILDON) \
        `pkg-config --libs dbus-1` `pkg-config --libs hildon-control-panel`
-PREFIX = /usr/local
+PREFIX = /usr
 
 other_obj = ../configfile.o