From 1bd772a4f32e01947bb8ae1df4762a78a08cafe8 Mon Sep 17 00:00:00 2001
From: SoftCoder <mark_vejvoda@hotmail.com>
Date: Tue, 21 Jan 2014 23:40:53 -0800
Subject: [PATCH] - updated linux and windows installer scripts with new paths

---
 mk/linux/mojosetup/megaglest-installer/make.sh       |  8 ++++----
 .../mojosetup/megaglest-installer/scripts/config.lua |  2 +-
 mk/windoze/Installer/MegaGlestInstaller.nsi          | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mk/linux/mojosetup/megaglest-installer/make.sh b/mk/linux/mojosetup/megaglest-installer/make.sh
index 2fdb78c8..34f3acd3 100755
--- a/mk/linux/mojosetup/megaglest-installer/make.sh
+++ b/mk/linux/mojosetup/megaglest-installer/make.sh
@@ -206,10 +206,10 @@ if [ $REPACKONLY -eq 0 ]; then
 	# Now copy all glest data
 	echo Copying live MegaGlest data files...
 
-	cp "$CURRENTDIR/$megaglest_data_path/megaglest.ico" $INSTALLDATADIR
-	cp "$CURRENTDIR/$megaglest_data_path/megaglest_uninstall.ico" $INSTALLDATADIR
-	cp "$CURRENTDIR/$megaglest_data_path/g3dviewer.ico" ${INSTALLDATADIR}
-	cp "$CURRENTDIR/$megaglest_data_path/editor.ico" ${INSTALLDATADIR}
+	cp "$CURRENTDIR/$megaglest_linux_path/megaglest.ico" $INSTALLDATADIR
+	cp "$CURRENTDIR/$megaglest_linux_path/megaglest-uninstall.ico" $INSTALLDATADIR
+	cp "$CURRENTDIR/$megaglest_linux_path/g3dviewer.ico" ${INSTALLDATADIR}
+	cp "$CURRENTDIR/$megaglest_linux_path/editor.ico" ${INSTALLDATADIR}
 
 	mkdir -p "$INSTALLDATADIR/data/"
 #	svn export --force "$CURRENTDIR/$megaglest_data_path/data/" "$INSTALLDATADIR/data/"
diff --git a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
index f5a63d2e..3bebbbfc 100644
--- a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
+++ b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
@@ -157,7 +157,7 @@ Setup.Package
             genericname = _("MegaGlest"),
             tooltip = _("A real time strategy game."),
             builtin_icon = false,
-	    icon = "megaglest_uninstall.ico",
+	    icon = "megaglest-uninstall.ico",
             commandline = "%0/uninstall-megaglest.sh",
             category = "Game;StrategyGame"
         }
diff --git a/mk/windoze/Installer/MegaGlestInstaller.nsi b/mk/windoze/Installer/MegaGlestInstaller.nsi
index 2982812e..65260694 100644
--- a/mk/windoze/Installer/MegaGlestInstaller.nsi
+++ b/mk/windoze/Installer/MegaGlestInstaller.nsi
@@ -3,8 +3,8 @@
 
 !define APNAME MegaGlest
 !define APNAME_OLD Mega-Glest
-!define APVER_OLD 3.9.0
-!define APVER 3.9.1
+!define APVER_OLD 3.9.0
+!define APVER 3.9.1
 
 Name "${APNAME} ${APVER}"
 SetCompressor /FINAL /SOLID lzma
@@ -216,10 +216,10 @@ Section "${APNAME} (required)"
   File "..\..\..\data\glest_game\megaglest_g3dviewer.exe"
   File "..\..\..\data\glest_game\7z.exe"
   File "..\..\..\data\glest_game\7z.dll"
-  File "..\..\..\data\glest_game\megaglest.ico"
-  File "..\..\..\data\glest_game\glest.ini"
-  File "..\..\..\data\glest_game\glestkeys.ini"
-  File "..\..\..\data\glest_game\servers.ini"
+  File "..\..\..\mk\windoze\megaglest.ico"
+  File "..\..\..\mk\windoze\glest.ini"
+  File "..\..\..\mk\windoze\glestkeys.ini"
+  File "..\..\..\mk\windoze\servers.ini"
   File "..\..\..\data\glest_game\openal32.dll"
   
   File "..\..\..\mk\windoze\NetworkThrottleFix.reg"