X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=telegps%2FMakefile.am;h=7b550e9eccd00573c9b53be1d8d78045944c2080;hb=e612693e33ef3b0e22db0656792992fa6e961ff2;hp=b64397c82292d21dd53918a1fd8a3ae23ed9ecda;hpb=92943bf4536d4167edd097e61de5e6b4f29130f8;p=fw%2Faltos

diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index b64397c8..7b550e9e 100644
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -74,6 +74,7 @@ ICONJAR= -C $(ICONDIR) telegps-16.png \
 	-C $(ICONDIR) telegps-256.png
 
 WINDOWS_ICON=$(ICONDIR)/telegps.ico
+MACOSX_ICON=$(ICONDIR)/TeleGPS.icns
 
 # Firmware
 FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
@@ -124,10 +125,10 @@ LINUX_EXTRA=telegps-fat telegps.desktop.in
 
 MACOSX_INFO_PLIST=Info.plist
 MACOSX_README=ReadMe-Mac.rtf
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_README) $(DOC)
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_README) $(DOC) $(MACOSX_ICON)
 MACOSX_EXTRA=$(FIRMWARE)
 
-WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(DOC) $(WINDOWS_ICON)
+WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(top_srcdir)/altusmetrum.cat $(DOC) $(WINDOWS_ICON)
 
 if FATINSTALL
 
@@ -264,9 +265,11 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 	mkdir macosx
 	cp -a TeleGPS.app macosx/
 	cp -a $(MACOSX_README) macosx/ReadMe.rtf
-	cp -a $(DOC) macosx
+	mkdir -p macosx/Doc
+	cp -a $(DOC) macosx/Doc
 	cp -p Info.plist macosx/TeleGPS.app/Contents
 	mkdir -p macosx/AltOS-$(VERSION) macosx/TeleGPS.app/Contents/Resources/Java
+	cp -p $(MACOSX_ICON) macosx/TeleGPS.app/Contents/Resources
 	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