--- Makefile.orig	Wed May 21 15:21:43 2014
+++ Makefile	Fri Sep  5 14:44:11 2014
@@ -21,8 +21,8 @@
 # Paths (packagers might want to set DATADIR and LOCALEDIR)
 
 USERDIR   := .neverball
-DATADIR   := ./data
-LOCALEDIR := ./locale
+DATADIR   := ${PREFIX}/share/neverball/data
+LOCALEDIR := ${PREFIX}/share/locale
 
 ifeq ($(PLATFORM),mingw)
 	USERDIR := Neverball
@@ -36,13 +36,13 @@
 # Optional flags (CFLAGS, CPPFLAGS, ...)
 
 ifeq ($(DEBUG),1)
-	CFLAGS   := -g
-	CXXFLAGS := -g
-	CPPFLAGS :=
+	CFLAGS   += -g
+	CXXFLAGS += -g
+	CPPFLAGS +=
 else
-	CFLAGS   := -O2
-	CXXFLAGS := -O2
-	CPPFLAGS := -DNDEBUG
+	CFLAGS   +=
+	CXXFLAGS := 
+	CPPFLAGS += -DNDEBUG
 endif
 
 #------------------------------------------------------------------------------
