Merge branch 'master' into diablo-package

[browser-switch] / Makefile

diff --git a/Makefile b/Makefile
index d12b7d7..443a560 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 CC = gcc
-CFLAGS = -Wall -Os
+CFLAGS = -Wall -Os $(EXTRA_CFLAGS)
 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