Use the new packaging directory for MacOSX specific files, and provide shell script workaround to make the svg icon reachable.

- 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>

Makefile

@@ -23,9 +23,7 @@ DESKTOPFILE = $(NAME).desktop
 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.
@@ -109,9 +107,11 @@ install-macosx: $(NAME)
 	$(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

packaging/macosx/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>
-	<string>subsurface</string>
+	<string>subsurface.sh</string>
 	<key>CFBundleIdentifier</key>
 	<string>torvalds.subsurface</string>
 </dict>

packaging/macosx/subsurface.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd `dirname $0`/../Resources
+../MacOS/subsurface &
+exit 0