altosui: fix telemetrum.inf FFFE:000A product names on AMD64 and ia64

[fw/altos] / ao-tools / altosui / altos-windows.nsi

diff --git a/ao-tools/altosui/altos-windows.nsi b/ao-tools/altosui/altos-windows.nsi
index 6f38ac0e17c7bdbecc5191f31766be75180633db..37777fd6c852cf37fb2d0e60b636e90c6663c4c6 100644 (file)
--- a/ao-tools/altosui/altos-windows.nsi
+++ b/ao-tools/altosui/altos-windows.nsi
@@ -40,12 +40,15 @@ Section "Install Driver" InstDriver
        SetOutPath $TEMP
        File "../../telemetrum.inf"
        InstDrv::InstallDriver /NOUNLOAD "$TEMP\telemetrum.inf"
+
+       SetOutPath $INSTDIR
+       File "../../telemetrum.inf"
 SectionEnd
 
 Section "AltosUI Application"
        SetOutPath $INSTDIR
 
-       File "altosui.jar"
+       File "altosui-fat.jar"
        File "cmudict04.jar"
        File "cmulex.jar"
        File "cmu_time_awb.jar"
@@ -58,19 +61,19 @@ Section "AltosUI Application"
 
        File "../../icon/*.ico"
 
-       CreateShortCut "$SMPROGRAMS\AltusMetrum.lnk" "$INSTDIR\altosui.jar" "" "$INSTDIR\altus-metrum.ico"
+       CreateShortCut "$SMPROGRAMS\AltusMetrum.lnk" "$INSTDIR\altosui-fat.jar" "" "$INSTDIR\altus-metrum.ico"
 SectionEnd
 
 Section "AltosUI Desktop Shortcut"
-       CreateShortCut "$DESKTOP\AltusMetrum.lnk" "$INSTDIR\altosui.jar"  "" "$INSTDIR\altus-metrum.ico"
+       CreateShortCut "$DESKTOP\AltusMetrum.lnk" "$INSTDIR\altosui-fat.jar"  "" "$INSTDIR\altus-metrum.ico"
 SectionEnd
 
 Section "TeleMetrum and TeleDongle Firmware"
 
        SetOutPath $INSTDIR
 
-       File "../../src/telemetrum-v1.0/telemetrum-v1.0.ihx"
-       File "../../src/teledongle-v0.2/teledongle-v0.2.ihx"
+       File "../../src/telemetrum-v1.0/telemetrum-v1.0-${VERSION}.ihx"
+       File "../../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
 
 SectionEnd