Index: cdogs-sdl-0.5.7/CMakeLists.txt
===================================================================
--- cdogs-sdl-0.5.7/CMakeLists.txt
+++ cdogs-sdl-0.5.7/CMakeLists.txt	2015-03-05 13:43:33.369999274 +0100
@@ -29,7 +29,7 @@
 endif()
 
 IF(UNIX AND NOT APPLE)
-	SET(CMAKE_INSTALL_PREFIX /usr/local)
+	SET(CMAKE_INSTALL_PREFIX /usr/local CACHE "Installation prefix" PATH)
 ENDIF()
 if(MINGW)
 	set(CMAKE_RC_COMPILER_INIT windres)
@@ -60,11 +60,11 @@
 INCLUDE_DIRECTORIES(src/cdogs/enet/include)
 
 execute_process(
-	COMMAND "sh" "sdl-config" "--libs"
+	COMMAND "sdl-config --libs"
 	OUTPUT_VARIABLE SDL_LDFLAGS
 	OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process(
-	COMMAND "sh" "sdl-config" "--cflags"
+	COMMAND "sdl-config --cflags"
 	OUTPUT_VARIABLE SDL_CFLAGS
 	OUTPUT_STRIP_TRAILING_WHITESPACE)
 # Work-around for CMake SDL bug (need to link SDLmain before SDL)
@@ -129,7 +129,7 @@
 if(GCW0)
 	set(CDOGS_DATA_DIR "./")
 else()
-	set(CDOGS_DATA_DIR "../")
+	set(CDOGS_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/games/cdogs-sdl/")
 endif()
 message("Data dir is ${CDOGS_DATA_DIR}")
 if(WIN32)
@@ -137,8 +137,8 @@
 else()
 	set(CDOGS_CFG_DIR ".config/cdogs-sdl/")
 ENDIF()
-SET(SOURCE_DIRECTORY ".")
-SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".")
+SET(SOURCE_DIRECTORY ${PROJECT_SOURCE_DIR})
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 IF(UNIX AND NOT APPLE)
 	CONFIGURE_FILE(${SOURCE_DIRECTORY}/build/linux/cdogs-sdl.cmake ${SOURCE_DIRECTORY}/build/linux/cdogs-sdl)
 	SET_SOURCE_FILES_PROPERTIES(${SOURCE_DIRECTORY}/build/linux/cdogs-sdl PROPERTIES GENERATED TRUE)
@@ -191,29 +191,26 @@
 	set(LIB_EXTENSION ".so")
 endif()
 if(APPLE)
-	install(
+	_(
 		DIRECTORY src/cdogs-sdl.app src/cdogs-sdl-editor.app
 		DESTINATION ${INSTALL_PREFIX}/bin
 		USE_SOURCE_PERMISSIONS)
 else()
 	install(
-		PROGRAMS src/cdogs-sdl${EXE_EXTENSION} src/cdogs-sdl-editor${EXE_EXTENSION}
-		DESTINATION ${INSTALL_PREFIX}/bin)
+		PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/src/cdogs-sdl${EXE_EXTENSION} ${CMAKE_CURRENT_BINARY_DIR}/src/cdogs-sdl-editor${EXE_EXTENSION}
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/games)
 endif()
 
 INSTALL(DIRECTORY
-	${SOURCE_DIRECTORY}/doc
 	${SOURCE_DIRECTORY}/data
 	${SOURCE_DIRECTORY}/missions
 	${SOURCE_DIRECTORY}/dogfights
 	${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})
+	DESTINATION ${CDOGS_DATA_DIR})
+INSTALL(FILES ${SOURCE_DIRECTORY}/cdogs_icon.bmp DESTINATION ${CDOGS_DATA_DIR})
+INSTALL(FILES ${SOURCE_DIRECTORY}/doc/CREDITS DESTINATION ${CDOGS_DATA_DIR}/doc)
 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)