X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Makefile;h=638758cd93aa546a62dcf142ebdf45f0252c3deb;hb=b1a1376f3baf78ceca49b47c7b39d58983f4f984;hp=3fa77c3f4e800b8791c80f71d92de2c140c57630;hpb=f231ab094351496017288ac35c64613ca0708744;p=ext%2Fsubsurface.git

diff --git a/Makefile b/Makefile
index 3fa77c3..638758c 100644
--- a/Makefile
+++ b/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