- Make use of the new packaging directory.
- Set a current directory for subsurface to find the svg icon. There might be a pretter solution to this.
- Somehow subsurface doesn't behave properly in the Dock. Running it in the background without Dock integration until we figure out why.
Signed-Off-By: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
MANFILES = $(NAME).1
MACOSXINSTALL = /Applications/Subsurface.app
-MACOSXICONFILE = macosx/Subsurface.icns
-MACOSXINFOFILE = macosx/Info.plist
-MACOSXPKGFILE = macosx/PkgInfo
+MACOSXFILES = packaging/macosx
# find libdivecomputer
# First deal with the cross compile environment.
$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources
$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/MacOS
$(INSTALL) $(NAME) $(MACOSXINSTALL)/Contents/MacOS/
- $(INSTALL) $(MACOSXINFOFILE) $(MACOSXINSTALL)/Contents/
- $(INSTALL) $(MACOSXPKGFILE) $(MACOSXINSTALL)/Contents/
- $(INSTALL) $(MACOSXICONFILE) $(MACOSXINSTALL)/Contents/Resources/
+ $(INSTALL) $(MACOSXFILES)/subsurface.sh $(MACOSXINSTALL)/Contents/MacOS/
+ $(INSTALL) $(MACOSXFILES)/PkgInfo $(MACOSXINSTALL)/Contents/
+ $(INSTALL) $(MACOSXFILES)/Info.plist $(MACOSXINSTALL)/Contents/
+ $(INSTALL) $(ICONFILE) $(MACOSXINSTALL)/Contents/Resources/
+ $(INSTALL) $(MACOSXFILES)/Subsurface.icns $(MACOSXINSTALL)/Contents/Resources/
parse-xml.o: parse-xml.c dive.h
$(CC) $(CFLAGS) $(GLIB2CFLAGS) -c $(XML2CFLAGS) parse-xml.c
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleIconFile</key>
- <string>Subsurface</string>
- <key>CFBundleName</key>
- <string>Subsurface</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleGetInfoString</key>
- <string>Rough divelog in C and Gtk</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleExecutable</key>
- <string>subsurface</string>
- <key>CFBundleIdentifier</key>
- <string>torvalds.subsurface</string>
-</dict>
-</plist>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleIconFile</key>
+ <string>Subsurface</string>
+ <key>CFBundleName</key>
+ <string>Subsurface</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleGetInfoString</key>
+ <string>Rough divelog in C and Gtk</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleExecutable</key>
+ <string>subsurface.sh</string>
+ <key>CFBundleIdentifier</key>
+ <string>torvalds.subsurface</string>
+</dict>
+</plist>
--- /dev/null
+#!/bin/sh
+
+cd `dirname $0`/../Resources
+../MacOS/subsurface &
+exit 0