From: Clément de l'Hamaide <clemaez@hotmail.fr>
Date: Thu, 31 Oct 2013 17:30:40 +0000 (+0100)
Subject: FG-Win32/64-nightly: move uninstaller in root directory
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d56452e439d5ec83d7aaa80795aecf633a054bbc;p=flightgear.git

FG-Win32/64-nightly: move uninstaller in root directory
---

diff --git a/package/Win-NSIS/flightgear-nightly-vs2010.nsi b/package/Win-NSIS/flightgear-nightly-vs2010.nsi
index d35f59b27..3d694c6ca 100644
--- a/package/Win-NSIS/flightgear-nightly-vs2010.nsi
+++ b/package/Win-NSIS/flightgear-nightly-vs2010.nsi
@@ -135,12 +135,12 @@ Section "" ;No components page, name is not important
   CreateShortCut "$SMPROGRAMS\FlightGear\FGCom-testing-nightly-2010.lnk" "$INSTDIR\bin\fgcom.exe" "-f910"
   
   
-  WriteUninstaller "$INSTDIR\bin\FlightGear_Uninstall.exe"
+  WriteUninstaller "$INSTDIR\FlightGear_Uninstall.exe"
   
   WriteRegStr HKLM ${UninstallKey} "DisplayName" "FlightGear Nightly (vs2010 build)"
   WriteRegStr HKLM ${UninstallKey} "DisplayVersion" "${FGVersion}"
-  WriteRegStr HKLM ${UninstallKey} "UninstallString" "$INSTDIR\bin\FlightGear_Uninstall.exe"
-  WriteRegStr HKLM ${UninstallKey} "UninstallPath" "$INSTDIR\bin\FlightGear_Uninstall.exe"
+  WriteRegStr HKLM ${UninstallKey} "UninstallString" "$INSTDIR\FlightGear_Uninstall.exe"
+  WriteRegStr HKLM ${UninstallKey} "UninstallPath" "$INSTDIR\FlightGear_Uninstall.exe"
   WriteRegDWORD HKLM ${UninstallKey} "NoModify" 1
   WriteRegDWORD HKLM ${UninstallKey} "NoRepair" 1
   WriteRegStr HKLM ${UninstallKey} "URLInfoAbout" "http://www.flightgear.org/"
diff --git a/package/Win-NSIS/flightgear64-nightly-vs2010.nsi b/package/Win-NSIS/flightgear64-nightly-vs2010.nsi
index 27d4d7709..a4065edfb 100644
--- a/package/Win-NSIS/flightgear64-nightly-vs2010.nsi
+++ b/package/Win-NSIS/flightgear64-nightly-vs2010.nsi
@@ -135,12 +135,12 @@ Section "" ;No components page, name is not important
   CreateShortCut "$SMPROGRAMS\FlightGear\FGCom-testing-nightly-2010.lnk" "$INSTDIR\bin\fgcom.exe" "-f910"
   
   
-  WriteUninstaller "$INSTDIR\bin\FlightGear_Uninstall.exe"
+  WriteUninstaller "$INSTDIR\FlightGear_Uninstall.exe"
   
   WriteRegStr HKLM ${UninstallKey} "DisplayName" "FlightGear64 Nightly (vs2010 build)"
   WriteRegStr HKLM ${UninstallKey} "DisplayVersion" "${FGVersion}"
-  WriteRegStr HKLM ${UninstallKey} "UninstallString" "$INSTDIR\bin\FlightGear_Uninstall.exe"
-  WriteRegStr HKLM ${UninstallKey} "UninstallPath" "$INSTDIR\bin\FlightGear_Uninstall.exe"
+  WriteRegStr HKLM ${UninstallKey} "UninstallString" "$INSTDIR\FlightGear_Uninstall.exe"
+  WriteRegStr HKLM ${UninstallKey} "UninstallPath" "$INSTDIR\FlightGear_Uninstall.exe"
   WriteRegDWORD HKLM ${UninstallKey} "NoModify" 1
   WriteRegDWORD HKLM ${UninstallKey} "NoRepair" 1
   WriteRegStr HKLM ${UninstallKey} "URLInfoAbout" "http://www.flightgear.org/"