diff -up cdogs-sdl-0.5.8/CMakeLists.txt~ cdogs-sdl-0.5.8/CMakeLists.txt
--- cdogs-sdl-0.5.8/CMakeLists.txt~	2015-06-18 14:29:51.000000000 +0200
+++ cdogs-sdl-0.5.8/CMakeLists.txt	2015-06-18 14:39:09.240694204 +0200
@@ -28,9 +28,6 @@ if("${CMAKE_C_COMPILER_ID}" STREQUAL "Cl
     set(CLANG 1)
 endif()
 
-IF(UNIX AND NOT APPLE)
-	SET(CMAKE_INSTALL_PREFIX /usr/local)
-ENDIF()
 if(MINGW)
 	set(CMAKE_RC_COMPILER_INIT windres)
 	enable_language(RC)
@@ -119,7 +119,7 @@ else()
 		endif()
 	endif()
 	if(NOT BEOS AND NOT HAIKU)
-		add_definitions(-Winline -Werror)
+		add_definitions(-Winline)
 		set(EXTRA_LIBRARIES "m")
 	endif()
 endif()
@@ -123,11 +123,6 @@ endif()
 
 set(CMAKE_MACOSX_RPATH 1)
 
-if(GCW0)
-	set(CDOGS_DATA_DIR "./")
-else()
-	set(CDOGS_DATA_DIR "../")
-endif()
 message("Data dir is ${CDOGS_DATA_DIR}")
 if(WIN32)
 	set(CDOGS_CFG_DIR "C-Dogs SDL/")
@@ -206,24 +201,7 @@ INSTALL(DIRECTORY
 	${SOURCE_DIRECTORY}/graphics
 	${SOURCE_DIRECTORY}/music
 	${SOURCE_DIRECTORY}/sounds
-	DESTINATION ${INSTALL_PREFIX})
-INSTALL(FILES
-	${SOURCE_DIRECTORY}/cdogs_icon.bmp
-	${SOURCE_DIRECTORY}/README.md
-	DESTINATION ${INSTALL_PREFIX})
-IF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
-	INSTALL(FILES ${SOURCE_DIRECTORY}/build/linux/cdogs-sdl.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
-	INSTALL(FILES ${SOURCE_DIRECTORY}/cdogs-sdl.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons)
-elseif(WIN32)
-	# Package for Windows
-	FILE(GLOB DLLS "${SOURCE_DIRECTORY}/src/*.dll")
-	FOREACH(DLL ${DLLS})
-		INSTALL(FILES "${DLL}" DESTINATION ${INSTALL_PREFIX}/bin)
-	ENDFOREACH()
-	install(DIRECTORY ${SOURCE_DIRECTORY}/build/licenses DESTINATION ${INSTALL_PREFIX})
-elseif(APPLE)
-	set(CMAKE_INSTALL_PREFIX "/Applications/cdogs-sdl")
-endif()
+	DESTINATION ${CDOGS_DATA_DIR})
 
 # Packaging
 SET(CPACK_PACKAGE_NAME "C-Dogs SDL")