Merge branch 'macosx-app-bundle-1' of git://github.com/henrik242/subsurface

* 'macosx-app-bundle-1' of git://github.com/henrik242/subsurface:
  Use the new packaging directory for MacOSX specific files, and provide shell script workaround to make the svg icon reachable.
  Ignore process serial number argument when run as native MacOSX app
  Add basic MacOSX app bundle install target

diff --combined Makefile
index 3f563a3b51e55af0aa264e29fc21890da39ba4a6,638758cd93aa546a62dcf142ebdf45f0252c3deb..ab7df0003b493071c777bd310e0dccdfce3f63ab
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -22,6 -22,9 +22,9 @@@ ICONFILE = $(NAME).sv
  DESKTOPFILE = $(NAME).desktop
  MANFILES = $(NAME).1
  
+ MACOSXINSTALL = /Applications/Subsurface.app
+ MACOSXFILES = packaging/macosx
+ 
  # find libdivecomputer
  # First deal with the cross compile environment.
  # For the native case, Linus doesn't want to trust pkg-config given
@@@ -90,9 -93,7 +93,9 @@@ install: $(NAME
        $(INSTALL) $(DESKTOPFILE) $(DESKTOPDIR)
        $(INSTALL) -d -m 755 $(ICONDIR)
        $(INSTALL) $(ICONFILE) $(ICONDIR)
 -      $(gtk_update_icon_cache)
 +      @-if test -z "$(DESTDIR)"; then \
 +              $(gtk_update_icon_cache); \
 +      fi
        $(INSTALL) -d -m 755 $(MANDIR)
        $(INSTALL) -m 644 $(MANFILES) $(MANDIR)
  
@@@ -102,6 -103,16 +105,16 @@@ GLIB2CFLAGS = $(shell $(PKGCONFIG) --cf
  GCONF2CFLAGS =  $(shell $(PKGCONFIG) --cflags gconf-2.0)
  GTK2CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-2.0)
  
+ install-macosx: $(NAME)
+       $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources
+       $(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/MacOS
+       $(INSTALL) $(NAME) $(MACOSXINSTALL)/Contents/MacOS/
+       $(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