From f8e1a5c8cb7c823459effcff24dea2c3279eac87 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Wed, 4 May 2011 22:30:32 +0000
Subject: [PATCH] - bugfixes found during testing of cmake builds

---
 mk/linux/makedata.sh                   |  4 +++-
 source/configurator/CMakeLists.txt     | 18 +++++++++---------
 source/g3d_viewer/CMakeLists.txt       | 16 ++++++++--------
 source/glest_map_editor/CMakeLists.txt | 16 ++++++++--------
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/mk/linux/makedata.sh b/mk/linux/makedata.sh
index 7dd1fdf03..6deaa156a 100755
--- a/mk/linux/makedata.sh
+++ b/mk/linux/makedata.sh
@@ -16,6 +16,7 @@ echo '----In mk/linux'
 find megaglest.bmp \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 find megaglest.desktop \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 find megaglest.png \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
+find glest.ico \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 popd
 #ls $RELEASEDIR
 
@@ -29,6 +30,7 @@ find editor.ico \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 find servers.ini \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 find glest.ini \( -name "*" \) -exec cp -p "{}" $RELEASEDIR/glest_linux.ini ';'
 find glestkeys.ini \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
+find configuration.xml \( -name "*" \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 
 find data/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 find docs/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
@@ -38,7 +40,7 @@ find techs/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -pru
 find tilesets/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 find tutorials/ \( -name "*" \) -not \( -name .svn -prune \) -not \( -name "*~" -prune \) -not \( -name "*.bak" -prune \) -exec cp -p --parents "{}" $RELEASEDIR ';'
 
-cp -p ../../CMake* $RELEASEDIR
+cp -p CMakeLists.txt $RELEASEDIR
 popd
 
 pushd $RELEASEDIR
diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt
index 21771b91d..2f4ebb7f6 100644
--- a/source/configurator/CMakeLists.txt
+++ b/source/configurator/CMakeLists.txt
@@ -127,16 +127,16 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
 		DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
 
 	# Installation of the program config and image files
-	INSTALL(FILES 
-	  "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
-	  "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
-          "${PROJECT_SOURCE_DIR}/mk/linux/configuration.xml"
-          "${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
-	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
+	#INSTALL(FILES 
+	#  "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
+	#  "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
+        #  "${PROJECT_SOURCE_DIR}/mk/linux/configuration.xml"
+        #  "${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
+	#  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
 
 	# Installation of the program desktop icon file
-	INSTALL(FILES 
-	  "${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
-	  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
+	#INSTALL(FILES 
+	#  "${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
+	#  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
 
 ENDIF()
diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index 2c3cdbbaa..1ed50655d 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -128,15 +128,15 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
 		DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
 
 	# Installation of the program config and image files
-	INSTALL(FILES 
-	  "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
-	  "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
-	  "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
-	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
+	#INSTALL(FILES 
+	#  "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
+	#  "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
+	#  "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
+	#  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
 
 	# Installation of the program desktop icon file
-	INSTALL(FILES 
-	  "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
-	  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
+	#INSTALL(FILES 
+	#  "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
+	#  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
 
 ENDIF()
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index ea12a0ad4..136cc58df 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -129,15 +129,15 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
 		DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
 
 	# Installation of the program config and image files
-	INSTALL(FILES 
-	  "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
-	  "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
-          "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico"
-	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
+	#INSTALL(FILES 
+	#  "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
+	#  "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
+        #  "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico"
+	#  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
 
 	# Installation of the program desktop icon file
-	INSTALL(FILES 
-	  "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico"
-	  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
+	#INSTALL(FILES 
+	#  "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico"
+	#  DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
 
 ENDIF()