Provide native x64 binary

packages/sumatrapdf.xml

@@ -2,22 +2,24 @@
 <packages>
     <package id="sumatrapdf"
 	     name="Lecteur de PDF SumatraPDF"
-	     revision="14"
+	     revision="15"
 	     priority="10"
 	     reboot="false">
 
          <variable name="PKG_VERSION" value="3.1.1" />
-         <variable architecture="x86" name="INSTALL_PATH" value="%PROGRAMFILES%\SumatraPDF" />
-         <variable architecture="x64" name="INSTALL_PATH" value="%PROGRAMFILES(x86)%\SumatraPDF" />
+         <variable architecture="x86" name="SETUP" value="SumatraPDF-%PKG_VERSION%-install.exe" />
+         <variable architecture="x64" name="SETUP" value="SumatraPDF-%PKG_VERSION%-64-install.exe" />
 
          <check type="uninstall" condition="versiongreaterorequal" path="SumatraPDF.*" value="%PKG_VERSION%" />
 
-	 <install cmd='"%SOFTWARE%\sumatrapdf\SumatraPDF-%PKG_VERSION%-install.exe" /S' />
+	 <install cmd='"%SOFTWARE%\sumatrapdf\SumatraPDF-%PKG_" /S' />
 
+         <!-- Remove the x86 variante -->
+         <upgrade architecture="x64" cmd='%COMSPEC% /C if exist "%PROGRAMFILES(x86)%\SumatraPDF\uninstall.exe" "%PROGRAMFILES(x86)%\SumatraPDF\uninstall.exe" /S' />
 	 <upgrade include="install" />
 
          <downgrade include="install" />
 
-	 <remove cmd='%COMSPEC% /C if exist "%INSTALL_PATH%\uninstall.exe" "%INSTALL_PATH%\uninstall.exe" /S' />
+	 <remove cmd='%COMSPEC% /C if exist "%PROGRAMFILES%\SumatraPDF\uninstall.exe" "%PROGRAMFILES%\SumatraPDF\uninstall.exe" /S' />
      </package>
 </packages>