diff options
| author | Keith Packard <keithp@keithp.com> | 2014-05-29 22:03:48 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-05-29 22:03:48 -0700 |
| commit | 29d325f418b401f61580288b5947b0df8ac5b717 (patch) | |
| tree | 26c8b78f29fda1d69c641de68e467cd634bc4761 | |
| parent | b74dfc9c2cbe14593738eb994e9163d466155326 (diff) | |
telegps: Fixup windows fat build harder
| -rw-r--r-- | telegps/Makefile.am | 2 | ||||
| -rw-r--r-- | telegps/telegps-windows.nsi.in | 4 |
2 files changed, 3 insertions, 3 deletions
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" |