From 6db2b394bf7d61980419890d3ca1ea3ad6de083f Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Thu, 5 May 2011 03:31:18 +0000
Subject: [PATCH] - renamed megalgest.bin to megaglest and megaglest to
 start_megaglest

---
 build-mg.sh                                   |  4 +--
 mk/linux/makedeps_folder.sh                   |  4 +--
 mk/linux/makerelease.sh                       |  2 +-
 .../mojosetup/megaglest-installer/make.sh     |  8 +++---
 .../megaglest-installer/makedeps_folder.sh    |  4 +--
 .../megaglest-installer/scripts/config.lua    |  2 +-
 mk/linux/{megaglest => start_megaglest}       |  0
 source/glest_game/CMakeLists.txt              | 27 ++++++++++---------
 8 files changed, 26 insertions(+), 25 deletions(-)
 rename mk/linux/{megaglest => start_megaglest} (100%)

diff --git a/build-mg.sh b/build-mg.sh
index 9b3333c1..6c6e9ae9 100755
--- a/build-mg.sh
+++ b/build-mg.sh
@@ -8,6 +8,6 @@ make
 
 cd ..
 echo 'You may now launch MegaGlest from this directory like this:'
-echo 'mk/linux/megaglest.bin --ini-path=mk/linux/ --data-path=mk/linux/'
+echo 'mk/linux/megaglest --ini-path=mk/linux/ --data-path=mk/linux/'
 echo 'or from within the build directory:'
-echo '../mk/linux/megaglest.bin --ini-path=../mk/linux/ --data-path=../mk/linux/'
+echo '../mk/linux/megaglest --ini-path=../mk/linux/ --data-path=../mk/linux/'
diff --git a/mk/linux/makedeps_folder.sh b/mk/linux/makedeps_folder.sh
index 0710e195..62537f85 100755
--- a/mk/linux/makedeps_folder.sh
+++ b/mk/linux/makedeps_folder.sh
@@ -86,8 +86,8 @@ sync_support_libs(){
 }
  
 usage(){
-	echo "Syntax : $0 megaglest.bin
-	echo "Example: $0 megaglest.bin
+	echo "Syntax : $0 megaglest
+	echo "Example: $0 megaglest
 	exit 1
 }
  
diff --git a/mk/linux/makerelease.sh b/mk/linux/makerelease.sh
index 3a5539b1..5e1d0e3f 100755
--- a/mk/linux/makerelease.sh
+++ b/mk/linux/makerelease.sh
@@ -34,7 +34,7 @@ cp -p servers.ini $RELEASEDIR
 cp -p glest.ico $RELEASEDIR
 cp -p megaglest.png $RELEASEDIR
 cp -p megaglest.desktop $RELEASEDIR
-cp -p megaglest $RELEASEDIR
+cp -p start_megaglest $RELEASEDIR
 cp -p start_megaglest_configurator $RELEASEDIR
 cp -p start_megaglest_mapeditor $RELEASEDIR
 cp -p start_megaglest_g3dviewer $RELEASEDIR
diff --git a/mk/linux/mojosetup/megaglest-installer/make.sh b/mk/linux/mojosetup/megaglest-installer/make.sh
index 18a9918c..90ea5094 100755
--- a/mk/linux/mojosetup/megaglest-installer/make.sh
+++ b/mk/linux/mojosetup/megaglest-installer/make.sh
@@ -145,8 +145,8 @@ if [ $REPACKONLY -eq 0 ]; then
 
 	pushd "`pwd`/$megaglest_linux_path"
 
-	find megaglest -exec cp -p --parents "{}" $INSTALLDATADIR ';'
-	find megaglest.bin -exec cp -p --parents "{}" ${INSTALLDATADIR}bin ';'
+	find start_megaglest -exec cp -p --parents "{}" $INSTALLDATADIR ';'
+	find megaglest -exec cp -p --parents "{}" ${INSTALLDATADIR}bin ';'
 	find glest.ini -exec cp -p --parents "{}" $INSTALLDATADIR ';'
 	find megaglest.bmp -exec cp -p --parents "{}" $INSTALLDATADIR ';'
 	find glestkeys.ini -exec cp -p --parents "{}" $INSTALLDATADIR ';'
@@ -211,9 +211,9 @@ if [ $REPACKONLY -eq 0 ]; then
 	find data/ -name "*~" -exec rm -rf {} \;
         find data/ -name "*.bak" -exec rm -rf {} \;
 
-	# Copy shared lib dependencies for megaglest.bin
+	# Copy shared lib dependencies for megaglest
 	cd data
-	copyGlestDeptsCmd="${INSTALL_ROOTDIR}makedeps_folder.sh bin/megaglest.bin"
+	copyGlestDeptsCmd="${INSTALL_ROOTDIR}makedeps_folder.sh bin/megaglest"
 	$copyGlestDeptsCmd
 	cd ..
 fi
diff --git a/mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh b/mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh
index 0710e195..62537f85 100755
--- a/mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh
+++ b/mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh
@@ -86,8 +86,8 @@ sync_support_libs(){
 }
  
 usage(){
-	echo "Syntax : $0 megaglest.bin
-	echo "Example: $0 megaglest.bin
+	echo "Syntax : $0 megaglest
+	echo "Example: $0 megaglest
 	exit 1
 }
  
diff --git a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
index 9fb6ec16..ae3c15b3 100644
--- a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
+++ b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
@@ -102,7 +102,7 @@ Setup.Package
             tooltip = _("A real time strategy game."),
             builtin_icon = false,
             icon = "megaglest.ico",
-            commandline = "%0/megaglest",
+            commandline = "%0/start_megaglest",
             category = "Game;StrategyGame"
         },
 
diff --git a/mk/linux/megaglest b/mk/linux/start_megaglest
similarity index 100%
rename from mk/linux/megaglest
rename to mk/linux/start_megaglest
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index 8d29d6f3..53f365c9 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -169,7 +169,7 @@ ENDIF()
 IF(WIN32)
 	SET(TARGET_NAME "megaglest")
 ELSE()
-	SET(TARGET_NAME "megaglest.bin")
+	SET(TARGET_NAME "megaglest")
 ENDIF()
 
 IF(UNIX AND NOT APPLE)
@@ -192,20 +192,21 @@ TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
 
 # Requires an install prefix for the items below to work
 IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
-	IF(NOT WIN32)
+	#IF(NOT WIN32)
 		#set_target_properties(megaglest.bin PROPERTIES OUTPUT_NAME "megaglest")
 		# rename the binary for installation
-		MESSAGE(STATUS "Copying [${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}] to [${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest]")
-		install(CODE 
-			"EXECUTE_PROCESS(COMMAND \"cmake\" \"-E\" \"copy\" \"${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}\" \"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest\")")
+	#	MESSAGE(STATUS "Copying [${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}] to [${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest]")
+	#	install(CODE 
+	#		"EXECUTE_PROCESS(COMMAND \"cmake\" \"-E\" \"copy\" \"${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME}\" \"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest\")")
 
-		install(CODE 
-			"EXECUTE_PROCESS(COMMAND \"chmod\" \"+x\" \"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest\")")
+	#	install(CODE 
+	#		"EXECUTE_PROCESS(COMMAND \"chmod\" \"+x\" \"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_BIN_INSTALL_PATH}/megaglest\")")
 
-	ELSE()
-		# Installation of the program
-		INSTALL(TARGETS 
-			${TARGET_NAME} 
-			DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
-	ENDIF()
+	#ELSE()
+	
+	# Installation of the program
+	INSTALL(TARGETS 
+		${TARGET_NAME} 
+		DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
+	#ENDIF()
 ENDIF()