(svn r4061) -Codechange: [OSX] removed some long dead flags for universal binary building and removed an absolute path for hdiutil (I don't thin anybody will have it at a non-default place, but still)
authorbjarni
Thu, 23 Mar 2006 13:40:33 +0000
changeset 3304 42fc3a675136
parent 3303 b0c382927186
child 3305 cfeaa8e862e4
(svn r4061) -Codechange: [OSX] removed some long dead flags for universal binary building and removed an absolute path for hdiutil (I don't thin anybody will have it at a non-default place, but still)
os/macosx/Makefile
--- a/os/macosx/Makefile	Thu Mar 23 13:29:58 2006 +0000
+++ b/os/macosx/Makefile	Thu Mar 23 13:40:33 2006 +0000
@@ -27,13 +27,6 @@
 	$(Q)rm $@.uni $@.ppc970
 endif
 
-ifdef UNIVERSAL_PPC_PART
-# the bundle is build by the PPC compile when making universal binaries
-BUILD_OSX_BUNDLE:=
-else
-BUILD_OSX_BUNDLE:=build_OSX_bundle
-endif
-
 ifdef JAGUAR
 JAGUAR_POSTFIX := -jaguar
 endif
@@ -41,7 +34,7 @@
 # build the bundle. OSX wants to keep apps in bundles, so we will give it one
 # the good thing about bundles is that you can keep extra files in them, so we keep lng files and a data dir in it
 
-$(BUILD_OSX_BUNDLE): $(TTD)
+BUILD_OSX_BUNDLE: $(TTD)
 	@echo '===> Building application bundle'
 	$(Q)rm -fr "$(OSXAPP)"
 	$(Q)mkdir -p "$(OSXAPP)"/Contents/MacOS
@@ -73,9 +66,9 @@
 	$(Q)cp os/macosx/*.webloc "OpenTTD $(REV)"
 	$(Q)cp known-bugs.txt "OpenTTD $(REV)/known-bugs.txt"
 	$(Q)cp scenario/* "OpenTTD $(REV)/scenario/"
-	$(Q)/usr/bin/hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(REV)" openttd-"$(REV)"-osx"$(JAGUAR_POSTFIX)".dmg
+	$(Q)hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(REV)" openttd-"$(REV)"-osx"$(JAGUAR_POSTFIX)".dmg
 	$(Q)rm -fr "OpenTTD $(REV)"
 
-$(OSX): $(TTD) $(BUILD_OSX_BUNDLE)
+$(OSX): $(TTD) BUILD_OSX_BUNDLE
 
 .PHONY: release $(BUILD_OSX_BUNDLE) $(UNIVERSAL_BINARY)