telegps: Fixup windows fat build harder

diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index f140512dd86a125c6efb1d6a10a21880b5a145fd..7e17b3311752ac3be6edcee26a6d8f5e5128ba25 100644 (file)
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -277,7 +277,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) telegps-windows.nsi
        -rm -f $@
-       makensis -Otelegps-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" telegps-windows.nsi || cat telegps-windows.log && exit 1
+       makensis -Otelegps-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" telegps-windows.nsi || (cat telegps-windows.log && exit 1)
 
 Manifest.txt: Makefile
        echo 'Main-Class: org.altusmetrum.telegps.TeleGPS' > $@

diff --git a/telegps/telegps-windows.nsi.in b/telegps/telegps-windows.nsi.in
index d86cb04968f4c08bf44ed54e4fca29556c4b9998..02a1cc436a7e64f951f847703a9f753ba1061f54 100644 (file)
--- a/telegps/telegps-windows.nsi.in
+++ b/telegps/telegps-windows.nsi.in
@@ -116,8 +116,8 @@ Section "TeleGPS Firmware"
        SetOutPath $INSTDIR
 
 ;      File "../src/telegps-v1.0/telegps-v1.0-${VERSION}.ihx"
-       File "../src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
-       File "../src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
+       File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
+       File "../src/telebt-v1.0/telebt-v1.0-${VERSION}.ihx"
 SectionEnd
 
 Section "Documentation"