From: Keith Packard <keithp@keithp.com>
Date: Thu, 29 May 2014 05:06:43 +0000 (-0700)
Subject: telegps: Don't try to ship TeleGPS firmware yet
X-Git-Tag: 1.3.2.2~43
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=c30130d0bdc18ee351eb3d02e51f70f8a05905b1;ds=sidebyside

telegps: Don't try to ship TeleGPS firmware yet

It's not quite ready. Instead, ship TBT and TD firmware.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index f8e2e63c..f064a488 100644
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -76,10 +76,13 @@ WINDOWS_ICON=$(ICONDIR)/telegps.ico
 FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
 FIRMWARE_TD=$(FIRMWARE_TD_0_2)
 
-FIRMWARE_TG_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
-FIRMWARE_TG=$(FIRMWARE_TG_1_0)
+FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
+FIRMWARE_TBT=$(FIRMWARE_TBT_1_0)
 
-FIRMWARE=$(FIRMWARE_TG)
+#FIRMWARE_TG_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
+#FIRMWARE_TG=$(FIRMWARE_TG_1_0)
+
+FIRMWARE=$(FIRMWARE_TG) $(FIRMWARE_TD) $(FIRMWARE_TBT)
 
 desktopdir = $(datadir)/applications
 desktop_file = telegps.desktop
@@ -260,7 +263,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 	cp -a $(MACOSX_README) macosx/ReadMe.rtf
 	cp -a $(DOC) macosx
 	cp -p Info.plist macosx/TeleGPS.app/Contents
-	mkdir -p macosx/TeleGPS.app/Contents/Resources/Java
+	mkdir -p macosx/AltOS-$(VERSION) macosx/TeleGPS.app/Contents/Resources/Java
 	cp -p $(FATJAR) macosx/TeleGPS.app/Contents/Resources/Java/telegps.jar
 	cp -p libaltos.dylib macosx/TeleGPS.app/Contents/Resources/Java
 	cp -p $(ALTOSLIB_CLASS) macosx/TeleGPS.app/Contents/Resources/Java