From c30130d0bdc18ee351eb3d02e51f70f8a05905b1 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 28 May 2014 22:06:43 -0700 Subject: [PATCH 1/1] 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 --- telegps/Makefile.am | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 -- 2.30.2