Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -101,8 +101,6 @@ else()
 		if(DEBUG_PROFILE AND CMAKE_COMPILER_IS_GNUCC)
 			add_definitions(-p)
 		endif()
-	else()
-		add_definitions(-O2)
 	endif()
 	if(GCW0)
 		add_definitions(-D__GCWZERO__)
@@ -129,7 +127,7 @@ else()
 		endif()
 	endif()
 	if(NOT BEOS AND NOT HAIKU)
-		add_definitions(-Winline -Werror)
+		add_definitions(-Winline)
 		set(EXTRA_LIBRARIES "m")
 	endif()
 endif()
@@ -140,7 +138,7 @@ if(NOT DEFINED CDOGS_DATA_DIR)
 	if(GCW0)
 		set(CDOGS_DATA_DIR "./")
 	else()
-		set(CDOGS_DATA_DIR "../")
+		set(CDOGS_DATA_DIR "share/cdogs-sdl")
 	endif()
 endif()
 message("Data dir is ${CDOGS_DATA_DIR}")
@@ -196,7 +194,7 @@ elseif(APPLE)
 	set(INSTALL_PREFIX "cdogs-sdl")
 else()
 	set(LIB_EXTENSION ".so")
-	set(DATA_INSTALL_DIR ".")
+	set(DATA_INSTALL_DIR "share/cdogs-sdl")
 endif()
 
 # Since Debian wants games binaries in /usr/games
