From e9602779be84e6c23aeb248f3b603a610b22cff9 Mon Sep 17 00:00:00 2001
From: Cong <c_xong@hotmail.com>
Date: Mon, 2 Sep 2013 17:51:21 +1000
Subject: [PATCH] Fix linux build and package

---
 .gitignore     | 3 +++
 CMakeLists.txt | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6af2ca48c..edc296abb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,13 +4,16 @@ Makefile
 Makefile.*
 cdogs-sdl
 *.exe
+*.tar.gz
 cdogs-sdl-editor
 libcdogs.a
 autosave_test
+color_test
 config_test
 tmp
 libjson.a
 .cdogs/
+*.so
 
 # CMake stuff
 *CMakeCache.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f968fb6b4..a22fce5e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,6 +112,7 @@ set_target_properties(hqx PROPERTIES
 	RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/src
 	RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/src
 	RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src
+	LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src
 )
 
 if(WIN32)
@@ -121,7 +122,9 @@ else()
 	set(EXE_EXTENSION "")
 	set(LIB_EXTENSION ".so")
 endif()
-install(FILES src/cdogs-sdl${EXE_EXTENSION} src/cdogs-sdl-editor${EXE_EXTENSION} src/libhqx${LIB_EXTENSION} DESTINATION bin)
+install(
+	PROGRAMS src/cdogs-sdl${EXE_EXTENSION} src/cdogs-sdl-editor${EXE_EXTENSION} src/libhqx${LIB_EXTENSION}
+	DESTINATION bin)
 
 # Installation
 INSTALL(DIRECTORY
@@ -141,7 +144,7 @@ IF(UNIX AND NOT APPLE)
 	INSTALL(FILES
 		${SOURCE_DIRECTORY}/build/linux/cdogs-sdl.desktop
 		${SOURCE_DIRECTORY}/cdogs_icon.png
-		DESTINATION .)
+		DESTINATION bin)
 ENDIF()
 IF(MSVC)
 	# Package for Windows