summaryrefslogtreecommitdiff
path: root/telegps/Makefile.am
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2014-08-14 17:08:36 -0600
committerBdale Garbee <bdale@gag.com>2014-08-14 17:08:36 -0600
commit4828be0ca5252ac9cd6061209385dcd6c4c57965 (patch)
treedde4f86d893d280fbeef284120d6f967cdbfeaa5 /telegps/Makefile.am
parent17e894d1b65231d07df009bc4e8ca92864ccf790 (diff)
parent165b7dcf6fba90b15ff32b891cba4b9111c1965b (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'telegps/Makefile.am')
-rw-r--r--telegps/Makefile.am10
1 files changed, 9 insertions, 1 deletions
diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index 6138b004..3b33428e 100644
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -87,6 +87,14 @@ MACOSX_ICONS =\
../icon/application-vnd.altusmetrum.eeprom.icns \
../icon/application-vnd.altusmetrum.telemetry.icns
+LINUX_ICONS =\
+ $(ICONDIR)/altusmetrum-altosui.svg \
+ $(ICONDIR)/application-vnd.altusmetrum.eeprom.svg \
+ $(ICONDIR)/application-vnd.altusmetrum.telemetry.svg
+
+LINUX_MIMETYPE =\
+ $(ICONDIR)/org-altusmetrum-mimetypes.xml
+
# Firmware
FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
FIRMWARE_TD=$(FIRMWARE_TD_0_2)
@@ -131,7 +139,7 @@ DOC=$(TELEGPS_DOC)
FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
-LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) $(desktop_file).in ../icon/altusmetrum-telegps.svg
+LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) $(desktop_file).in $(LINUX_ICONS) $(LINUX_MIMETYPE)
LINUX_EXTRA=telegps-fat $(desktop_file).in
MACOSX_INFO_PLIST=Info.plist