diff options
| -rw-r--r-- | micropeak/Makefile.am | 4 | ||||
| -rw-r--r-- | telegps/Info.plist.in | 2 | ||||
| -rw-r--r-- | telegps/Makefile.am | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am index e38a0f81..216874df 100644 --- a/micropeak/Makefile.am +++ b/micropeak/Makefile.am @@ -72,6 +72,7 @@ ICONJAR= -C $(ICONDIR) micropeak-16.png \ -C $(ICONDIR) micropeak-256.png WINDOWS_ICON=$(ICONDIR)/micro-peak.ico +MACOSX_ICON=$(ICONDIR)/MicroPeak.icns desktopdir = $(datadir)/applications desktop_file = micropeak.desktop @@ -112,7 +113,7 @@ MACOSX_DRIVER_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver MACOSX_DRIVER=FTDIUSBSerialDriver_v2_2_18.dmg MACOSX_INFO_PLIST=Info.plist MACOSX_README=ReadMe-Mac.rtf -MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README) $(DOC) +MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README) $(DOC) $(MACOSX_ICON) $(MACOSX_DRIVER): wget $(MACOSX_DRIVER_URL) @@ -260,6 +261,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) cp -p Info.plist macosx/MicroPeak.app/Contents cp -p $(MACOSX_DRIVER) macosx mkdir -p macosx/MicroPeak.app/Contents/Resources/Java + cp -p $(MACOSX_ICON) macosx/MicroPeak.app/Contents/Resources cp -p $(FATJAR) macosx/MicroPeak.app/Contents/Resources/Java/micropeak.jar cp -p libaltos.dylib macosx/MicroPeak.app/Contents/Resources/Java cp -p $(ALTOSLIB_CLASS) macosx/MicroPeak.app/Contents/Resources/Java diff --git a/telegps/Info.plist.in b/telegps/Info.plist.in index 4c351c79..df05bb6e 100644 --- a/telegps/Info.plist.in +++ b/telegps/Info.plist.in @@ -23,7 +23,7 @@ <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleIconFile</key> - <string>TeleGPSIcon.icns</string> + <string>TeleGPS.icns</string> <key>Java</key> <dict> <key>MainClass</key> diff --git a/telegps/Makefile.am b/telegps/Makefile.am index b64397c8..5812756f 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,7 +125,7 @@ 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) @@ -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 |