From: Keith Packard <keithp@keithp.com>
Date: Fri, 30 May 2014 05:03:48 +0000 (-0700)
Subject: telegps: Fixup windows fat build harder
X-Git-Tag: 1.3.2.2~33
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=29d325f418b401f61580288b5947b0df8ac5b717;hp=b74dfc9c2cbe14593738eb994e9163d466155326

telegps: Fixup windows fat build harder
---

diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index f140512d..7e17b331 100644
--- 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 d86cb049..02a1cc43 100644
--- 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"